From 67cf2cb05a3717791565052b87fffe0d42c705fc Mon Sep 17 00:00:00 2001 From: "Frank.R.Wu" Date: Thu, 9 Dec 2021 14:43:21 +0800 Subject: [PATCH 01/13] chore: keep sync --- agent-backend | 2 +- cm | 2 +- common | 2 +- front-base | 2 +- router-backend | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agent-backend b/agent-backend index 5ffc5fb..4a58947 160000 --- a/agent-backend +++ b/agent-backend @@ -1 +1 @@ -Subproject commit 5ffc5fb8130f4c4ed995c1b802c46f080130406e +Subproject commit 4a589474b4d0df2ad4a316d204bdf02c5366d22a diff --git a/cm b/cm index 9657f19..896cbfe 160000 --- a/cm +++ b/cm @@ -1 +1 @@ -Subproject commit 9657f1930f6a6fc0e3030483d0f248487287542a +Subproject commit 896cbfeb5b1c32401f9ea49dc4edc06c540591da diff --git a/common b/common index b0ef7bb..42baeae 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit b0ef7bbf100336f4e1b2dea6b7c0ec91afef29f2 +Subproject commit 42baeaeef6718a8e394d468c86221125014734ab diff --git a/front-base b/front-base index c8cf9cc..c5fc2dc 160000 --- a/front-base +++ b/front-base @@ -1 +1 @@ -Subproject commit c8cf9cca586da1b2df260cc2eb6a7ad3441eb7f5 +Subproject commit c5fc2dc54e8b58cc201d278d0f2f72c9ed1e7b2d diff --git a/router-backend b/router-backend index bf14fd6..f71bfda 160000 --- a/router-backend +++ b/router-backend @@ -1 +1 @@ -Subproject commit bf14fd6adb3472ce247bd468128bdbe7c8c3e6d9 +Subproject commit f71bfda28e7ff2121e7a0f2b5cd37b93703beb84 From 7ca401d1bc83ede3ad1c27b2106c08067bc2369a Mon Sep 17 00:00:00 2001 From: "Frank.R.Wu" Date: Thu, 9 Dec 2021 15:04:39 +0800 Subject: [PATCH 02/13] feat: update DHTUtil update DHTUtil.getClusterByKey to ignore prefix '04' of nodeIds --- cm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cm b/cm index 896cbfe..14e918f 160000 --- a/cm +++ b/cm @@ -1 +1 @@ -Subproject commit 896cbfeb5b1c32401f9ea49dc4edc06c540591da +Subproject commit 14e918fa18d959889511a250425f141090ce0bfb From b0217cd0e45a96b2fbe4e23d0a551e1d1a8b991f Mon Sep 17 00:00:00 2001 From: "Frank.R.Wu" Date: Thu, 9 Dec 2021 15:32:36 +0800 Subject: [PATCH 03/13] fix: fix bugs in DHTUtil fix the bug in DHTUtil which is wrong arguments when calling constructor of BigInteger --- cm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cm b/cm index 14e918f..a9ba6fe 160000 --- a/cm +++ b/cm @@ -1 +1 @@ -Subproject commit 14e918fa18d959889511a250425f141090ce0bfb +Subproject commit a9ba6fea6e766e5ddd2aaf7979c5a72de5eceba4 From 0fffe33f1ed05564bad82a4aaf9e08e880ec1f46 Mon Sep 17 00:00:00 2001 From: "Frank.R.Wu" Date: Fri, 10 Dec 2021 17:41:37 +0800 Subject: [PATCH 04/13] chore: keep sync --- agent-backend | 2 +- cm | 2 +- genparser | 2 +- mockjava | 2 +- router-backend | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agent-backend b/agent-backend index 4a58947..bb9e5f9 160000 --- a/agent-backend +++ b/agent-backend @@ -1 +1 @@ -Subproject commit 4a589474b4d0df2ad4a316d204bdf02c5366d22a +Subproject commit bb9e5f9b4fba7d6496c76ae4033f1105a9ae1920 diff --git a/cm b/cm index a9ba6fe..f2e39a6 160000 --- a/cm +++ b/cm @@ -1 +1 @@ -Subproject commit a9ba6fea6e766e5ddd2aaf7979c5a72de5eceba4 +Subproject commit f2e39a634d54025fecc6c121da26e02e968cb61b diff --git a/genparser b/genparser index 705d271..03fda50 160000 --- a/genparser +++ b/genparser @@ -1 +1 @@ -Subproject commit 705d271e0cbbf18cc8454a2a4c951d96fcfcc13e +Subproject commit 03fda50fcfb1eaeb09a2f375e5324a6f125b4c88 diff --git a/mockjava b/mockjava index 4337937..47385d4 160000 --- a/mockjava +++ b/mockjava @@ -1 +1 @@ -Subproject commit 433793771a4d09afab268d92b2403c4cd5a66250 +Subproject commit 47385d4073fb6823775a4f71386cce890bb99245 diff --git a/router-backend b/router-backend index f71bfda..9b9d6d8 160000 --- a/router-backend +++ b/router-backend @@ -1 +1 @@ -Subproject commit f71bfda28e7ff2121e7a0f2b5cd37b93703beb84 +Subproject commit 9b9d6d8314bf83d8aef87a137e9056aa305e507d From deb9e3d5022802cca382f8cde2330922018eff5c Mon Sep 17 00:00:00 2001 From: "Frank.R.Wu" Date: Fri, 10 Dec 2021 18:00:43 +0800 Subject: [PATCH 05/13] chore: keep sync --- genparser | 2 +- mockjava | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/genparser b/genparser index 03fda50..ddb7073 160000 --- a/genparser +++ b/genparser @@ -1 +1 @@ -Subproject commit 03fda50fcfb1eaeb09a2f375e5324a6f125b4c88 +Subproject commit ddb7073deb9b1563bfb96495908554dee0d7c2c3 diff --git a/mockjava b/mockjava index 47385d4..89a71a4 160000 --- a/mockjava +++ b/mockjava @@ -1 +1 @@ -Subproject commit 47385d4073fb6823775a4f71386cce890bb99245 +Subproject commit 89a71a4d9d792c7780fd7edf0e9cf072f7983e1f From ef83c4672406b69bef05751e776969cd9d924c17 Mon Sep 17 00:00:00 2001 From: "Frank.R.Wu" Date: Sat, 11 Dec 2021 22:43:59 +0800 Subject: [PATCH 06/13] chore: update version update version to 1.6.5 in build.gradle, AgentDockerfile and ClusterDockerfile; keep sync --- agent-backend | 2 +- agent-frontend | 2 +- build.gradle | 2 +- common | 2 +- docker/AgentDockerfile | 2 +- docker/ClusterDockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/agent-backend b/agent-backend index bb9e5f9..33f8bda 160000 --- a/agent-backend +++ b/agent-backend @@ -1 +1 @@ -Subproject commit bb9e5f9b4fba7d6496c76ae4033f1105a9ae1920 +Subproject commit 33f8bda6652b752d250cf45a428318c4e587d6ec diff --git a/agent-frontend b/agent-frontend index 37476bd..0dfa8a5 160000 --- a/agent-frontend +++ b/agent-frontend @@ -1 +1 @@ -Subproject commit 37476bd50648deb653c1202fdb4cad6ab5140c82 +Subproject commit 0dfa8a555a82dbb6c915f77c512563a841c61675 diff --git a/build.gradle b/build.gradle index 62a19b9..99c048a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'idea' } -def currVersion = "1.6.0" +def currVersion = "1.6.5" ext.projectIds = ['group': 'com.bdware.sc', 'version': currVersion] sourceCompatibility = 1.8 diff --git a/common b/common index 42baeae..654ec47 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 42baeaeef6718a8e394d468c86221125014734ab +Subproject commit 654ec47663c2eb5ff7c2cf7d980f5b10c8e1763c diff --git a/docker/AgentDockerfile b/docker/AgentDockerfile index e4ca5fa..988f196 100644 --- a/docker/AgentDockerfile +++ b/docker/AgentDockerfile @@ -4,7 +4,7 @@ ARG GOPRIVATE=bdware.org/* ARG GOPROXY=https://goproxy.cn LABEL maintainer="caihuaqian@internetapi.cn" -LABEL org.bdware.version="1.6.0" +LABEL org.bdware.version="1.6.5" LABEL org.bdware.version.isproduction="true" LABEL org.bdware.release-date="2021-12-02" diff --git a/docker/ClusterDockerfile b/docker/ClusterDockerfile index 37c75b5..5a448e1 100644 --- a/docker/ClusterDockerfile +++ b/docker/ClusterDockerfile @@ -4,7 +4,7 @@ ARG GOPRIVATE=bdware.org/* ARG GOPROXY=https://goproxy.cn LABEL maintainer="caihuaqian@internetapi.cn" -LABEL org.bdware.version="1.6.0" +LABEL org.bdware.version="1.6.5" LABEL org.bdware.version.isproduction="false" LABEL org.bdware.release-date="2021-12-02" From 6e4743bc75c99905be8ed56c75e1f758b3be4e03 Mon Sep 17 00:00:00 2001 From: "Frank.R.Wu" Date: Sun, 12 Dec 2021 12:26:58 +0800 Subject: [PATCH 07/13] chore: keep sync --- agent-frontend | 2 +- cm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent-frontend b/agent-frontend index 0dfa8a5..965ee67 160000 --- a/agent-frontend +++ b/agent-frontend @@ -1 +1 @@ -Subproject commit 0dfa8a555a82dbb6c915f77c512563a841c61675 +Subproject commit 965ee674094664ddf99013eed26f6aaacac4fe01 diff --git a/cm b/cm index f2e39a6..f59775d 160000 --- a/cm +++ b/cm @@ -1 +1 @@ -Subproject commit f2e39a634d54025fecc6c121da26e02e968cb61b +Subproject commit f59775da3f14cef728e9a441fdd8ec9fa0f0d10d From a1dd98e15b739c491febe6895d67218db01097c1 Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Sun, 12 Dec 2021 13:12:32 +0800 Subject: [PATCH 08/13] update docker upgrade log4j to 2.15.0 --- docker/AgentDockerfile | 2 +- docker/ClusterDockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/AgentDockerfile b/docker/AgentDockerfile index 988f196..a62be4c 100644 --- a/docker/AgentDockerfile +++ b/docker/AgentDockerfile @@ -6,7 +6,7 @@ ARG GOPROXY=https://goproxy.cn LABEL maintainer="caihuaqian@internetapi.cn" LABEL org.bdware.version="1.6.5" LABEL org.bdware.version.isproduction="true" -LABEL org.bdware.release-date="2021-12-02" +LABEL org.bdware.release-date="2021-12-12" COPY ./output /bdcontract WORKDIR /bdcontract diff --git a/docker/ClusterDockerfile b/docker/ClusterDockerfile index 5a448e1..4f7cfae 100644 --- a/docker/ClusterDockerfile +++ b/docker/ClusterDockerfile @@ -6,7 +6,7 @@ ARG GOPROXY=https://goproxy.cn LABEL maintainer="caihuaqian@internetapi.cn" LABEL org.bdware.version="1.6.5" LABEL org.bdware.version.isproduction="false" -LABEL org.bdware.release-date="2021-12-02" +LABEL org.bdware.release-date="2021-12-12" COPY ./output /bdcluster WORKDIR /bdcluster From 56ad48e66f295e575ee646a86f3deb5bce91e8a6 Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Sun, 12 Dec 2021 13:12:38 +0800 Subject: [PATCH 09/13] update docker upgrade log4j to 2.15.0 --- common | 2 +- front-base | 2 +- genparser | 2 +- mockjava | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common b/common index 654ec47..fa8af41 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 654ec47663c2eb5ff7c2cf7d980f5b10c8e1763c +Subproject commit fa8af412e6c5184cc2f8b38fe1b2645327dfd763 diff --git a/front-base b/front-base index c5fc2dc..05a8a99 160000 --- a/front-base +++ b/front-base @@ -1 +1 @@ -Subproject commit c5fc2dc54e8b58cc201d278d0f2f72c9ed1e7b2d +Subproject commit 05a8a992db8d4f0190c50791dbceb2a2ae4e80a7 diff --git a/genparser b/genparser index ddb7073..68661c6 160000 --- a/genparser +++ b/genparser @@ -1 +1 @@ -Subproject commit ddb7073deb9b1563bfb96495908554dee0d7c2c3 +Subproject commit 68661c63944659ed8a769d1df102ed8e9f7a8804 diff --git a/mockjava b/mockjava index 89a71a4..938951d 160000 --- a/mockjava +++ b/mockjava @@ -1 +1 @@ -Subproject commit 89a71a4d9d792c7780fd7edf0e9cf072f7983e1f +Subproject commit 938951d34a5ee40b23510b167e411464b7f00b2f From 074d27405a54aa991a59474a19dc33bb658405e3 Mon Sep 17 00:00:00 2001 From: "Frank.R.Wu" Date: Sun, 12 Dec 2021 17:12:57 +0800 Subject: [PATCH 10/13] chore: keep sync --- agent-backend | 2 +- cm | 2 +- mockjava | 2 +- router-backend | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agent-backend b/agent-backend index 33f8bda..0ea97d1 160000 --- a/agent-backend +++ b/agent-backend @@ -1 +1 @@ -Subproject commit 33f8bda6652b752d250cf45a428318c4e587d6ec +Subproject commit 0ea97d17cbd7affe2bd6791d4cfd383a867dc23e diff --git a/cm b/cm index f59775d..c3f1407 160000 --- a/cm +++ b/cm @@ -1 +1 @@ -Subproject commit f59775da3f14cef728e9a441fdd8ec9fa0f0d10d +Subproject commit c3f1407b6fbc2b7e59b050c1e72c9c0a95c59f48 diff --git a/mockjava b/mockjava index 938951d..293810f 160000 --- a/mockjava +++ b/mockjava @@ -1 +1 @@ -Subproject commit 938951d34a5ee40b23510b167e411464b7f00b2f +Subproject commit 293810f23679b5ccef7fbbb6a55e431c42f518dc diff --git a/router-backend b/router-backend index 9b9d6d8..d563866 160000 --- a/router-backend +++ b/router-backend @@ -1 +1 @@ -Subproject commit 9b9d6d8314bf83d8aef87a137e9056aa305e507d +Subproject commit d5638662debd1c82d56df4d40e32646b83af108a From 053c97310a1aacd9d85b8b15261bf41b8562c092 Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Fri, 17 Dec 2021 12:53:49 +0800 Subject: [PATCH 11/13] update join info support joinCount function --- docker/buildClusterDocker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/buildClusterDocker.sh b/docker/buildClusterDocker.sh index 5a97fe8..d4716bb 100755 --- a/docker/buildClusterDocker.sh +++ b/docker/buildClusterDocker.sh @@ -11,7 +11,7 @@ if [ $# -lt 1 ]; then fi #linux/arm64/v8, if [ "$2" == "push" ]; then - docker buildx build --platform linux/amd64,linux/arm64/v8 -t bdware/bdcluster:$1.arm64 ./ --push + docker buildx build --platform linux/amd64,linux/arm64/v8 -t bdware/bdcluster:$1 ./ --push elif [ "$2" == "save" ]; then docker buildx build --platform linux/amd64 -t bdware/bdcluster:$1 ./ --load docker save -o $3/bdcluster-$1.tar bdware/bdcluster:$1 @@ -19,4 +19,4 @@ else # docker buildx build --platform linux/arm64/v8 -t bdware/bdcluster:$1 ./ --load docker build -t bdware/bdcluster:$1 ./ docker tag bdware/bdcluster:$1 bdware/bdcluster:latest -fi +fi \ No newline at end of file From aebe14866ad57b3e982fd29aab893b6797092f61 Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Fri, 17 Dec 2021 12:55:07 +0800 Subject: [PATCH 12/13] keep sync --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index fa8af41..8548c5e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit fa8af412e6c5184cc2f8b38fe1b2645327dfd763 +Subproject commit 8548c5ea00ac0158d5ba3786d2bf4ae2fbb8a41b From 002509437875c11e41671ecfd292cbfe7cdd9df4 Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Fri, 17 Dec 2021 12:53:54 +0800 Subject: [PATCH 13/13] update join info support joinCount function --- agent-backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent-backend b/agent-backend index 0ea97d1..db5e845 160000 --- a/agent-backend +++ b/agent-backend @@ -1 +1 @@ -Subproject commit 0ea97d17cbd7affe2bd6791d4cfd383a867dc23e +Subproject commit db5e8451b09c9d3fc570b4b90b2ba4a77d144be2