Skip to content

Commit

Permalink
update doc
Browse files Browse the repository at this point in the history
  • Loading branch information
nxttl-ucas committed May 17, 2021
1 parent fe9cd7a commit ee4ec33
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README-en.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ base on CamelliaRedisTemplate,provide some toolkit of redis, such as redis-loc
[QUICK START](/docs/toolkit/toolkit.md)

## Version
latest version is 1.0.24,have deploy to maven central repository on 2021/05/11
latest version is 1.0.25,have deploy to maven central repository on 2021/05/17
[CHANGE_LOG](/update-en.md)

## Contact
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Camellia是网易云信开发的服务器基础组件,所有模块均已应用
[快速开始](/docs/toolkit/toolkit.md)

## 版本
最新版本是1.0.24,已经发布到maven中央仓库(2021/05/11
最新版本是1.0.25,已经发布到maven中央仓库(2021/05/17
[更新日志](/update-zh.md)

## 联系方式
Expand Down
16 changes: 8 additions & 8 deletions docs/redis-proxy/redis-proxy-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ MULTI,DISCARD,EXEC,WATCH,UNWATCH,
```

## 快速开始一
1) 首先创建一个spring-boot的工程,然后添加以下依赖(最新1.0.24),如下:(see [sample-code](/camellia-samples/camellia-redis-proxy-samples)):
1) 首先创建一个spring-boot的工程,然后添加以下依赖(最新1.0.25),如下:(see [sample-code](/camellia-samples/camellia-redis-proxy-samples)):
```
<dependency>
<groupId>com.netease.nim</groupId>
<artifactId>camellia-redis-proxy-spring-boot-starter</artifactId>
<version>1.0.24</version>
<version>1.0.25</version>
</dependency>
```
2) 编写主类Application.java, 如下:
Expand Down Expand Up @@ -159,9 +159,9 @@ OK
## 快速开始二
下载最新版安装包并解压(v1.0.24):
```
wget https://github.com/netease-im/camellia/releases/download/v1.0.24/camellia-redis-proxy-1.0.24.tar.gz
tar zxvf camellia-redis-proxy-1.0.24.tar.gz
cd camellia-redis-proxy-1.0.24/
wget https://github.com/netease-im/camellia/releases/download/v1.0.25/camellia-redis-proxy-1.0.25.tar.gz
tar zxvf camellia-redis-proxy-1.0.25.tar.gz
cd camellia-redis-proxy-1.0.25/
```
按需修改BOOT-INF/classes/下的配置文件:
* application.yml
Expand All @@ -179,11 +179,11 @@ java -XX:+UseG1GC -Xms2048m -Xmx2048m -server org.springframework.boot.loader.Ja
```

## 快速开始三(基于fatJar和sample-code)
下载源码,切到最新稳定分支(v1.0.24
下载源码,切到最新稳定分支(v1.0.25
```
git clone https://github.com/netease-im/camellia.git
cd camellia
git checkout v1.0.24
git checkout v1.0.25
```
按需修改[sample-code](/camellia-samples/camellia-redis-proxy-samples) 中的配置文件:
* application.yml
Expand All @@ -198,7 +198,7 @@ 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.24.jar
java -XX:+UseG1GC -Xms2048m -Xmx2048m -server -jar camellia-redis-proxy-samples-1.0.25.jar
```

## 路由配置
Expand Down
2 changes: 1 addition & 1 deletion update-en.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* support client-cache feature of redis6.0
* support monitor data visualization in prometheus

# 1.0.25(2021/05/xx
# 1.0.25(2021/05/17
### add
* camellia-redis-proxy support close idle upstream redis connection, default setting true
* camellia-redis-proxy support monitor connect count of upstream redis
Expand Down
2 changes: 1 addition & 1 deletion update-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 支持redis6.0的client-cache特性
* 支持监控数据可视化到prometheus等平台

# 1.0.25(2021/05/xx
# 1.0.25(2021/05/17
### 新增
* camellia-redis-proxy支持关闭到后端redis的空闲连接,默认开启
* camellia-redis-proxy支持监控到后端redis的连接数,具体见:[监控数据](/docs/redis-proxy/monitor-data.md)
Expand Down

0 comments on commit ee4ec33

Please sign in to comment.