diff --git a/README-en.md b/README-en.md index 8dd681d8b..a695ef046 100644 --- a/README-en.md +++ b/README-en.md @@ -87,7 +87,7 @@ provide some tools, such as compress utils CamelliaCompressor, encrypt utils Cam [QUICK START](/docs/tools/tools.md) ## Version -latest version is 1.0.39，have deploy to maven central repository on 2021/10/18 +latest version is 1.0.40，have deploy to maven central repository on 2021/10/19 [CHANGE_LOG](/update-en.md) ## Contact diff --git a/README.md b/README.md index e0aa7fb3a..a32160588 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Camellia是网易云信开发的服务器基础组件，所有模块均已应用 [快速开始](/docs/id-gen/id-gen.md) ## 版本 -最新版本是1.0.39，已经发布到maven中央仓库（2021/10/18） +最新版本是1.0.40，已经发布到maven中央仓库（2021/10/19） [更新日志](/update-zh.md) ## 联系方式 diff --git a/camellia-core/pom.xml b/camellia-core/pom.xml index 976ed00c2..d293daf9c 100644 --- a/camellia-core/pom.xml +++ b/camellia-core/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-core - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-dashboard/pom.xml b/camellia-dashboard/pom.xml index 1bc9c175a..b3e82b81e 100644 --- a/camellia-dashboard/pom.xml +++ b/camellia-dashboard/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-dashboard - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 @@ -42,22 +42,22 @@ com.netease.nim camellia-core - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-tools - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-hbase - 1.0.40-SNAPSHOT + 1.0.40 io.springfox diff --git a/camellia-hbase/pom.xml b/camellia-hbase/pom.xml index 91bdb5f4a..7a9ba32d5 100644 --- a/camellia-hbase/pom.xml +++ b/camellia-hbase/pom.xml @@ -4,19 +4,19 @@ 4.0.0 camellia-hbase - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-core - 1.0.40-SNAPSHOT + 1.0.40 org.apache.hbase diff --git a/camellia-id-gen/camellia-id-gen-core/pom.xml b/camellia-id-gen/camellia-id-gen-core/pom.xml index 24561e493..6fceb5bba 100644 --- a/camellia-id-gen/camellia-id-gen-core/pom.xml +++ b/camellia-id-gen/camellia-id-gen-core/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-id-gen-core - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen - 1.0.40-SNAPSHOT + 1.0.40 @@ -21,7 +21,7 @@ com.netease.nim camellia-redis - 1.0.40-SNAPSHOT + 1.0.40 com.googlecode.concurrentlinkedhashmap diff --git a/camellia-id-gen/camellia-id-gen-sdk/pom.xml b/camellia-id-gen/camellia-id-gen-sdk/pom.xml index fde71b574..0d7504d43 100644 --- a/camellia-id-gen/camellia-id-gen-sdk/pom.xml +++ b/camellia-id-gen/camellia-id-gen-sdk/pom.xml @@ -4,19 +4,19 @@ 4.0.0 camellia-id-gen-sdk - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-core - 1.0.40-SNAPSHOT + 1.0.40 com.squareup.okhttp3 diff --git a/camellia-id-gen/pom.xml b/camellia-id-gen/pom.xml index ec6962c4b..abde43daf 100644 --- a/camellia-id-gen/pom.xml +++ b/camellia-id-gen/pom.xml @@ -4,14 +4,14 @@ 4.0.0 camellia-id-gen - 1.0.40-SNAPSHOT + 1.0.40 pom com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-redis-proxy-hbase/pom.xml b/camellia-redis-proxy-hbase/pom.xml index b09e2c2e3..f68b8e240 100644 --- a/camellia-redis-proxy-hbase/pom.xml +++ b/camellia-redis-proxy-hbase/pom.xml @@ -4,24 +4,24 @@ 4.0.0 camellia-redis-proxy-hbase - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-proxy - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-hbase - 1.0.40-SNAPSHOT + 1.0.40 redis.clients diff --git a/camellia-redis-proxy/pom.xml b/camellia-redis-proxy/pom.xml index 3c8c17740..eaa22d609 100644 --- a/camellia-redis-proxy/pom.xml +++ b/camellia-redis-proxy/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-proxy - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 @@ -26,7 +26,7 @@ com.netease.nim camellia-redis - 1.0.40-SNAPSHOT + 1.0.40 redis.clients diff --git a/camellia-redis-proxy/src/main/java/com/netease/nim/camellia/redis/proxy/command/async/info/ProxyInfoUtils.java b/camellia-redis-proxy/src/main/java/com/netease/nim/camellia/redis/proxy/command/async/info/ProxyInfoUtils.java index b73238686..94a9877d0 100644 --- a/camellia-redis-proxy/src/main/java/com/netease/nim/camellia/redis/proxy/command/async/info/ProxyInfoUtils.java +++ b/camellia-redis-proxy/src/main/java/com/netease/nim/camellia/redis/proxy/command/async/info/ProxyInfoUtils.java @@ -43,7 +43,7 @@ public class ProxyInfoUtils { private static final ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 0, TimeUnit.SECONDS, new LinkedBlockingQueue<>(8), new DefaultThreadFactory("proxy-info")); - private static final String VERSION = "v1.0.39"; + private static final String VERSION = "v1.0.40"; private static int port; private static int consolePort; private static int bossThread; diff --git a/camellia-redis-zk/camellia-redis-zk-common/pom.xml b/camellia-redis-zk/camellia-redis-zk-common/pom.xml index b8e535f4f..cddf6134d 100644 --- a/camellia-redis-zk/camellia-redis-zk-common/pom.xml +++ b/camellia-redis-zk/camellia-redis-zk-common/pom.xml @@ -4,19 +4,19 @@ 4.0.0 camellia-redis-zk-common - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-zk - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis - 1.0.40-SNAPSHOT + 1.0.40 redis.clients diff --git a/camellia-redis-zk/camellia-redis-zk-discovery/pom.xml b/camellia-redis-zk/camellia-redis-zk-discovery/pom.xml index 4ab2bfbdb..629ca5898 100644 --- a/camellia-redis-zk/camellia-redis-zk-discovery/pom.xml +++ b/camellia-redis-zk/camellia-redis-zk-discovery/pom.xml @@ -4,19 +4,19 @@ 4.0.0 camellia-redis-zk-discovery - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-zk - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-zk-common - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-redis-zk/camellia-redis-zk-registry/pom.xml b/camellia-redis-zk/camellia-redis-zk-registry/pom.xml index b9049c454..82591e754 100644 --- a/camellia-redis-zk/camellia-redis-zk-registry/pom.xml +++ b/camellia-redis-zk/camellia-redis-zk-registry/pom.xml @@ -4,19 +4,19 @@ 4.0.0 camellia-redis-zk-registry - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-zk - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-zk-common - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-redis-zk/pom.xml b/camellia-redis-zk/pom.xml index 5616c0d99..caad2c6a3 100644 --- a/camellia-redis-zk/pom.xml +++ b/camellia-redis-zk/pom.xml @@ -5,14 +5,14 @@ 4.0.0 camellia-redis-zk - 1.0.40-SNAPSHOT + 1.0.40 pom com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-redis/pom.xml b/camellia-redis/pom.xml index 86076d850..3aaa1256a 100644 --- a/camellia-redis/pom.xml +++ b/camellia-redis/pom.xml @@ -4,19 +4,19 @@ 4.0.0 camellia-redis - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-core - 1.0.40-SNAPSHOT + 1.0.40 redis.clients diff --git a/camellia-samples/camellia-core-samples/pom.xml b/camellia-samples/camellia-core-samples/pom.xml index 6760205fb..192f7a108 100644 --- a/camellia-samples/camellia-core-samples/pom.xml +++ b/camellia-samples/camellia-core-samples/pom.xml @@ -4,19 +4,19 @@ 4.0.0 camellia-core-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-core - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-dashboard-samples/pom.xml b/camellia-samples/camellia-dashboard-samples/pom.xml index d7235c668..5ab2410d0 100644 --- a/camellia-samples/camellia-dashboard-samples/pom.xml +++ b/camellia-samples/camellia-dashboard-samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-dashboard-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-dashboard-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-hbase-samples/pom.xml b/camellia-samples/camellia-hbase-samples/pom.xml index 39e113277..561f99662 100644 --- a/camellia-samples/camellia-hbase-samples/pom.xml +++ b/camellia-samples/camellia-hbase-samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-hbase-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-hbase-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-id-gen-segment-samples/pom.xml b/camellia-samples/camellia-id-gen-segment-samples/pom.xml index bd14498e9..4fc8eb0b8 100644 --- a/camellia-samples/camellia-id-gen-segment-samples/pom.xml +++ b/camellia-samples/camellia-id-gen-segment-samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-id-gen-segment-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,17 +28,17 @@ com.netease.nim camellia-id-gen-sdk - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-segment-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-id-loader - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-id-gen-snowflake-samples/pom.xml b/camellia-samples/camellia-id-gen-snowflake-samples/pom.xml index 7d853fe3c..8ad867a07 100644 --- a/camellia-samples/camellia-id-gen-snowflake-samples/pom.xml +++ b/camellia-samples/camellia-id-gen-snowflake-samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-id-gen-snowflake-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,17 +28,17 @@ com.netease.nim camellia-id-gen-sdk - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-snowflake-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-id-gen-strict-samples/pom.xml b/camellia-samples/camellia-id-gen-strict-samples/pom.xml index 979a6e2e1..66a5a974d 100644 --- a/camellia-samples/camellia-id-gen-strict-samples/pom.xml +++ b/camellia-samples/camellia-id-gen-strict-samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-id-gen-strict-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,22 +28,22 @@ com.netease.nim camellia-id-gen-strict-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-id-loader - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-sdk - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-redis-proxy-hbase-samples/pom.xml b/camellia-samples/camellia-redis-proxy-hbase-samples/pom.xml index 8f653c728..09c0debb9 100644 --- a/camellia-samples/camellia-redis-proxy-hbase-samples/pom.xml +++ b/camellia-samples/camellia-redis-proxy-hbase-samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-proxy-hbase-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 @@ -40,7 +40,7 @@ com.netease.nim camellia-redis-proxy-hbase-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-redis-proxy-samples/pom.xml b/camellia-samples/camellia-redis-proxy-samples/pom.xml index 363e928cf..71c58c664 100644 --- a/camellia-samples/camellia-redis-proxy-samples/pom.xml +++ b/camellia-samples/camellia-redis-proxy-samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-proxy-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 @@ -34,22 +34,22 @@ com.netease.nim camellia-redis-proxy-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-proxy-zk-registry-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-proxy-nacos-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-tools - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-redis-samples/pom.xml b/camellia-samples/camellia-redis-samples/pom.xml index 7b8b9c307..2044f452a 100644 --- a/camellia-samples/camellia-redis-samples/pom.xml +++ b/camellia-samples/camellia-redis-samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,22 +28,22 @@ com.netease.nim camellia-redis-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-redis-base - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-zk-discovery-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-spring-temaplate-adaptor-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-spring-redis-samples/pom.xml b/camellia-samples/camellia-spring-redis-samples/pom.xml index a6caea9c2..1785a5eca 100644 --- a/camellia-samples/camellia-spring-redis-samples/pom.xml +++ b/camellia-samples/camellia-spring-redis-samples/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-spring-redis-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-spring-redis-zk-discovery-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-samples/camellia-tools-samples/pom.xml b/camellia-samples/camellia-tools-samples/pom.xml index ca6157e13..4ad3fe598 100644 --- a/camellia-samples/camellia-tools-samples/pom.xml +++ b/camellia-samples/camellia-tools-samples/pom.xml @@ -4,19 +4,19 @@ 4.0.0 camellia-tools-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-tools - 1.0.40-SNAPSHOT + 1.0.40 com.github.ben-manes.caffeine diff --git a/camellia-samples/pom.xml b/camellia-samples/pom.xml index a0a6583c6..dbe356683 100644 --- a/camellia-samples/pom.xml +++ b/camellia-samples/pom.xml @@ -5,14 +5,14 @@ 4.0.0 camellia-samples - 1.0.40-SNAPSHOT + 1.0.40 pom com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-spring-boot-starters/camellia-dashboard-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-dashboard-spring-boot-starter/pom.xml index c97968634..bd3d83942 100644 --- a/camellia-spring-boot-starters/camellia-dashboard-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-dashboard-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-dashboard-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -45,7 +45,7 @@ com.netease.nim camellia-dashboard - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-spring-boot-starters/camellia-hbase-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-hbase-spring-boot-starter/pom.xml index 4a1ece821..631b77b62 100644 --- a/camellia-spring-boot-starters/camellia-hbase-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-hbase-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-hbase-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-hbase - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-id-loader/pom.xml b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-id-loader/pom.xml index 8f43de153..7fb8b0435 100644 --- a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-id-loader/pom.xml +++ b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-id-loader/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-id-gen-id-loader - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-id-gen-core - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-segment-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-segment-spring-boot-starter/pom.xml index 471cd6bf9..a81381e4d 100644 --- a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-segment-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-segment-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-id-gen-segment-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-id-gen-core - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-snowflake-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-snowflake-spring-boot-starter/pom.xml index 51a2c0d20..2cfed236a 100644 --- a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-snowflake-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-snowflake-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-id-gen-snowflake-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-id-gen-core - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-strict-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-strict-spring-boot-starter/pom.xml index c2f7f4da8..996456223 100644 --- a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-strict-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/camellia-id-gen-strict-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-id-gen-strict-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-id-gen-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-id-gen-core - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/pom.xml b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/pom.xml index daf49af6a..15d2cf392 100644 --- a/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/pom.xml +++ b/camellia-spring-boot-starters/camellia-id-gen-spring-boot-starters/pom.xml @@ -5,14 +5,14 @@ 4.0.0 camellia-id-gen-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 pom com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-spring-boot-starters/camellia-redis-eureka-base/pom.xml b/camellia-spring-boot-starters/camellia-redis-eureka-base/pom.xml index 23515b935..42736c0af 100644 --- a/camellia-spring-boot-starters/camellia-redis-eureka-base/pom.xml +++ b/camellia-spring-boot-starters/camellia-redis-eureka-base/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-eureka-base - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -35,7 +35,7 @@ com.netease.nim camellia-redis - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.cloud diff --git a/camellia-spring-boot-starters/camellia-redis-eureka-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-redis-eureka-spring-boot-starter/pom.xml index ed4dd2aff..019dd8153 100644 --- a/camellia-spring-boot-starters/camellia-redis-eureka-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-redis-eureka-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-eureka-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -35,7 +35,7 @@ com.netease.nim camellia-redis-eureka-base - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-redis-proxy-hbase-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-redis-proxy-hbase-spring-boot-starter/pom.xml index bde015cf0..93df43bb2 100644 --- a/camellia-spring-boot-starters/camellia-redis-proxy-hbase-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-redis-proxy-hbase-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-proxy-hbase-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,22 +28,22 @@ com.netease.nim camellia-redis-proxy-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-hbase-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-proxy-hbase - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-spring-boot-starters/camellia-redis-proxy-nacos-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-redis-proxy-nacos-spring-boot-starter/pom.xml index e82c2929e..53a646ba5 100644 --- a/camellia-spring-boot-starters/camellia-redis-proxy-nacos-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-redis-proxy-nacos-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-proxy-nacos-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-redis-proxy-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.alibaba.nacos diff --git a/camellia-spring-boot-starters/camellia-redis-proxy-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-redis-proxy-spring-boot-starter/pom.xml index 0550e3db3..20da5b112 100644 --- a/camellia-spring-boot-starters/camellia-redis-proxy-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-redis-proxy-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-proxy-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-redis-proxy - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-redis-proxy-zk-registry-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-redis-proxy-zk-registry-spring-boot-starter/pom.xml index edc64db89..d1a3b924f 100644 --- a/camellia-spring-boot-starters/camellia-redis-proxy-zk-registry-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-redis-proxy-zk-registry-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-proxy-zk-registry-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,12 +28,12 @@ com.netease.nim camellia-redis-zk-registry - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-proxy-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-redis-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-redis-spring-boot-starter/pom.xml index 892e2e6dc..f9357382b 100644 --- a/camellia-spring-boot-starters/camellia-redis-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-redis-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,7 +28,7 @@ com.netease.nim camellia-redis - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-redis-spring-temaplate-adaptor-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-redis-spring-temaplate-adaptor-spring-boot-starter/pom.xml index c338564c1..680e694b9 100644 --- a/camellia-spring-boot-starters/camellia-redis-spring-temaplate-adaptor-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-redis-spring-temaplate-adaptor-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-spring-temaplate-adaptor-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,12 +28,12 @@ com.netease.nim camellia-redis-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-redis-base - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-spring-boot-starters/camellia-redis-zk-discovery-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-redis-zk-discovery-spring-boot-starter/pom.xml index ecf7e254c..d4912866b 100644 --- a/camellia-spring-boot-starters/camellia-redis-zk-discovery-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-redis-zk-discovery-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-redis-zk-discovery-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -28,12 +28,12 @@ com.netease.nim camellia-redis - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-zk-discovery - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-spring-redis-base/pom.xml b/camellia-spring-boot-starters/camellia-spring-redis-base/pom.xml index 91233c4b8..78e8ae680 100644 --- a/camellia-spring-boot-starters/camellia-spring-redis-base/pom.xml +++ b/camellia-spring-boot-starters/camellia-spring-redis-base/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-spring-redis-base - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -40,7 +40,7 @@ com.netease.nim camellia-redis - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-spring-boot-starters/camellia-spring-redis-eureka-discovery-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-spring-redis-eureka-discovery-spring-boot-starter/pom.xml index e675b3905..dea15e365 100644 --- a/camellia-spring-boot-starters/camellia-spring-redis-eureka-discovery-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-spring-redis-eureka-discovery-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-spring-redis-eureka-discovery-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -36,12 +36,12 @@ com.netease.nim camellia-redis-eureka-base - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-redis-base - 1.0.40-SNAPSHOT + 1.0.40 org.springframework.boot diff --git a/camellia-spring-boot-starters/camellia-spring-redis-zk-discovery-spring-boot-starter/pom.xml b/camellia-spring-boot-starters/camellia-spring-redis-zk-discovery-spring-boot-starter/pom.xml index 8d12b9db3..bc97f9a0b 100644 --- a/camellia-spring-boot-starters/camellia-spring-redis-zk-discovery-spring-boot-starter/pom.xml +++ b/camellia-spring-boot-starters/camellia-spring-redis-zk-discovery-spring-boot-starter/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-spring-redis-zk-discovery-spring-boot-starter - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 @@ -49,12 +49,12 @@ com.netease.nim camellia-spring-redis-base - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia-redis-zk-discovery - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-spring-boot-starters/pom.xml b/camellia-spring-boot-starters/pom.xml index 97893131b..1620775e9 100644 --- a/camellia-spring-boot-starters/pom.xml +++ b/camellia-spring-boot-starters/pom.xml @@ -5,14 +5,14 @@ 4.0.0 camellia-spring-boot-starters - 1.0.40-SNAPSHOT + 1.0.40 pom com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/camellia-tools/pom.xml b/camellia-tools/pom.xml index c52565d06..145e22b72 100644 --- a/camellia-tools/pom.xml +++ b/camellia-tools/pom.xml @@ -4,12 +4,12 @@ 4.0.0 camellia-tools - 1.0.40-SNAPSHOT + 1.0.40 com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 diff --git a/docs/redis-proxy/converter.md b/docs/redis-proxy/converter.md index 4078dc78c..e3d754711 100644 --- a/docs/redis-proxy/converter.md +++ b/docs/redis-proxy/converter.md @@ -162,7 +162,7 @@ public class CustomKeyConverter implements KeyConverter { com.netease.nim camellia-tools - 1.0.39 + 1.0.40 ``` diff --git a/docs/redis-proxy/info.md b/docs/redis-proxy/info.md index 011060c99..b626b9444 100644 --- a/docs/redis-proxy/info.md +++ b/docs/redis-proxy/info.md @@ -13,7 +13,7 @@ proxy实现了info命令，支持返回如下信息：Server/Clients/Route/Upstr ``` 127.0.0.1:6380> info # Server -camellia_redis_proxy_version:v1.0.39 ##proxy版本 +camellia_redis_proxy_version:v1.0.40 ##proxy版本 redis_version:6.2.5 ##spring actuator默认会使用info命令返回的redis_version字段来做健康检查，这里直接返回一个固定的版本号 available_processors:4 ##cpu核数 netty_boss_thread:1 ##netty的bossGroup的线程数，默认=1 diff --git a/docs/redis-proxy/nacos-conf.md b/docs/redis-proxy/nacos-conf.md index 8139d0594..9bc5b12a6 100644 --- a/docs/redis-proxy/nacos-conf.md +++ b/docs/redis-proxy/nacos-conf.md @@ -6,7 +6,7 @@ com.netease.nim camellia-redis-proxy-nacos-spring-boot-starter - 1.0.39 + 1.0.40 ``` diff --git a/docs/redis-proxy/quick-start-fat-jar.md b/docs/redis-proxy/quick-start-fat-jar.md index 11c8e7662..c0d97e38f 100644 --- a/docs/redis-proxy/quick-start-fat-jar.md +++ b/docs/redis-proxy/quick-start-fat-jar.md @@ -1,11 +1,11 @@ ## 快速开始（基于fatJar和sample-code) -下载源码，切到最新稳定分支（v1.0.39） +下载源码，切到最新稳定分支（v1.0.40） ``` git clone https://github.com/netease-im/camellia.git cd camellia -git checkout v1.0.39 +git checkout v1.0.40 ``` 按需修改[sample-code](/camellia-samples/camellia-redis-proxy-samples) 中的配置文件： * application.yml @@ -20,11 +20,11 @@ mvn clean install 找到可执行jar包，使用java -jar命令运行即可(注意设置内存和GC，并确保已经安装了jdk8或以上，并添加到path）： ``` cd camellia-samples/camellia-redis-proxy-samples/target -java -XX:+UseG1GC -Xms2048m -Xmx2048m -server -jar camellia-redis-proxy-samples-1.0.39.jar +java -XX:+UseG1GC -Xms2048m -Xmx2048m -server -jar camellia-redis-proxy-samples-1.0.40.jar ``` 如果是在容器环境，则需要添加UseContainerSupport参数（需要jdk8u191以上），如下： ``` cd camellia-samples/camellia-redis-proxy-samples/target -java -XX:+UseG1GC -XX:+UseContainerSupport -Xms2048m -Xmx2048m -server -jar camellia-redis-proxy-samples-1.0.39.jar +java -XX:+UseG1GC -XX:+UseContainerSupport -Xms2048m -Xmx2048m -server -jar camellia-redis-proxy-samples-1.0.40.jar ``` \ No newline at end of file diff --git a/docs/redis-proxy/quick-start-no-spring-boot.md b/docs/redis-proxy/quick-start-no-spring-boot.md index 7b7b38e70..de514e0f9 100644 --- a/docs/redis-proxy/quick-start-no-spring-boot.md +++ b/docs/redis-proxy/quick-start-no-spring-boot.md @@ -6,7 +6,7 @@ com.netease.nim camellia-redis-proxy - 1.0.39 + 1.0.40 ``` diff --git a/docs/redis-proxy/quick-start-package.md b/docs/redis-proxy/quick-start-package.md index 2d61b0200..97ed4ef1b 100644 --- a/docs/redis-proxy/quick-start-package.md +++ b/docs/redis-proxy/quick-start-package.md @@ -1,11 +1,11 @@ ## 快速开始（基于安装包） -下载最新版安装包并解压（v1.0.39）： +下载最新版安装包并解压（v1.0.40）： ``` -wget https://github.com/netease-im/camellia/releases/download/v1.0.39/camellia-redis-proxy-1.0.39.tar.gz -tar zxvf camellia-redis-proxy-1.0.39.tar.gz -cd camellia-redis-proxy-1.0.39/ +wget https://github.com/netease-im/camellia/releases/download/v1.0.40/camellia-redis-proxy-1.0.40.tar.gz +tar zxvf camellia-redis-proxy-1.0.40.tar.gz +cd camellia-redis-proxy-1.0.40/ ``` 按需修改BOOT-INF/classes/下的配置文件： * application.yml diff --git a/docs/redis-proxy/redis-proxy-zh.md b/docs/redis-proxy/redis-proxy-zh.md index 2590a67e2..6d36981aa 100644 --- a/docs/redis-proxy/redis-proxy-zh.md +++ b/docs/redis-proxy/redis-proxy-zh.md @@ -107,12 +107,12 @@ MULTI,DISCARD,EXEC,WATCH,UNWATCH, ``` ## 快速开始一 -1) 首先创建一个spring-boot的工程，然后添加以下依赖（最新1.0.39），如下：（see [sample-code](/camellia-samples/camellia-redis-proxy-samples)）: +1) 首先创建一个spring-boot的工程，然后添加以下依赖（最新1.0.40），如下：（see [sample-code](/camellia-samples/camellia-redis-proxy-samples)）: ``` com.netease.nim camellia-redis-proxy-spring-boot-starter - 1.0.39 + 1.0.40 ``` 2) 编写主类Application.java, 如下: diff --git a/pom.xml b/pom.xml index 9e5f75334..0d06acb76 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.netease.nim camellia - 1.0.40-SNAPSHOT + 1.0.40 camellia base module https://github.com/netease-im/camellia pom diff --git a/update-en.md b/update-en.md index a9f81b000..c0bca820c 100644 --- a/update-en.md +++ b/update-en.md @@ -5,7 +5,7 @@ * camellia-redis-proxy support monitor data visualization in prometheus * camellia-redis-proxy support multi-write based on mq(such as kafka) -# 1.0.40（2021/10/xx） +# 1.0.40（2021/10/19） ### add * camellia-redis-proxy support info command by http-api * camellia-redis-proxy support client connect of bid/bgroup in info command diff --git a/update-zh.md b/update-zh.md index 3417bd20d..8a84d144f 100644 --- a/update-zh.md +++ b/update-zh.md @@ -5,7 +5,7 @@ * camellia-redis-proxy支持监控数据可视化到prometheus等平台 * camellia-redis-proxy支持基于消息队列（如kafka）的异步双写 -# 1.0.40（2021/10/xx） +# 1.0.40（2021/10/19） ### 新增 * camellia-redis-proxy支持使用http-api执行info命令并获取相关信息，具体见：[info](/docs/redis-proxy/info.md) * camellia-redis-proxy的info命令新增返回bid/bgroup级别的客户端连接数数据数据，具体见：[info](/docs/redis-proxy/info.md)