diff --git a/sharding-jdbc-doc/content/00-overview/contribution.md b/sharding-jdbc-doc/content/00-overview/contribution.md
index 5246dd7e6f750f6ada41258c2f35b42f364dc158..09d11c02545c347e3f0997efcff7b5cfb5d38590 100644
--- a/sharding-jdbc-doc/content/00-overview/contribution.md
+++ b/sharding-jdbc-doc/content/00-overview/contribution.md
@@ -3,8 +3,8 @@ toc = true
date = "2017-04-12T16:06:17+08:00"
title = "贡献代码"
weight = 3
-prev = "/00-overview/release-note"
-next = "/01-start/index"
+prev = "/00-overview/release-notes/"
+next = "/01-start/index/"
+++
diff --git a/sharding-jdbc-doc/content/00-overview/index.md b/sharding-jdbc-doc/content/00-overview/index.md
index 89cbba414b9b09d0188e8ae940b1fd5c4369c5f6..7dd268651808342a484ba71a29a9dc1a3f2026bb 100644
--- a/sharding-jdbc-doc/content/00-overview/index.md
+++ b/sharding-jdbc-doc/content/00-overview/index.md
@@ -3,14 +3,19 @@ icon = "0. "
date = "2017-04-12T16:06:17+08:00"
title = "概览"
weight = 0
-prev = "/03-design/roadmap"
-next = "/00-overview/intro"
+prev = "/03-design/roadmap/"
+next = "/00-overview/intro/"
chapter = true
+++
# 概述
+[![GitHub release](https://img.shields.io/github/release/dangdangdotcom/sharding-jdbc.svg?style=social&label=Release)](https://github.com/dangdangdotcom/sharding-jdbc/releases)
+[![GitHub stars](https://img.shields.io/github/stars/dangdangdotcom/sharding-jdbc.svg?style=social&label=Star)](https://github.com/dangdangdotcom/sharding-jdbc/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/dangdangdotcom/sharding-jdbc.svg?style=social&label=Fork)](https://github.com/dangdangdotcom/sharding-jdbc/fork)
+[![GitHub watchers](https://img.shields.io/github/watchers/dangdangdotcom/sharding-jdbc.svg?style=social&label=Watch)](https://github.com/dangdangdotcom/sharding-jdbc/watchers)
+
Sharding-JDBC是当当应用框架ddframe中,关系型数据库模块dd-rdb中分离出来的数据库水平扩展框架,即透明化数据库分库分表访问。Sharding-JDBC继dubbox和Elastic-Job之后,是ddframe系列开源的第三个产品。
Sharding-JDBC定位为轻量级java框架,使用客户端直连数据库,以jar包形式提供服务,未使用中间层,无需额外部署,无其他依赖,DBA也无需改变原有的运维方式,可理解为增强版的JDBC驱动,旧代码迁移成本几乎为零。
@@ -18,8 +23,7 @@ Sharding-JDBC定位为轻量级java框架,使用客户端直连数据库,以
[![Maven Status](https://maven-badges.herokuapp.com/maven-central/com.dangdang/sharding-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.dangdang/sharding-jdbc)
[![Build Status](https://secure.travis-ci.org/dangdangdotcom/sharding-jdbc.svg?branch=master)](https://travis-ci.org/dangdangdotcom/sharding-jdbc)
[![Coverage Status](https://coveralls.io/repos/dangdangdotcom/sharding-jdbc/badge.svg?branch=master&service=github)](https://coveralls.io/github/dangdangdotcom/sharding-jdbc?branch=master)
-[![GitHub release](https://img.shields.io/github/release/dangdangdotcom/sharding-jdbc.svg)](https://github.com/dangdangdotcom/sharding-jdbc/releases)
-[![Hex.pm](http://dangdangdotcom.github.io/elastic-job/img/license.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![Hex.pm](http://dangdangdotcom.github.io/sharding-jdbc/img/license.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
# 功能列表
diff --git a/sharding-jdbc-doc/content/00-overview/intro.md b/sharding-jdbc-doc/content/00-overview/intro.md
index af7aa9ad9ef213b6b13ec679cd0d041ea5505c64..e1b19a5ea3498c6228abed865499ab78761b9fc9 100644
--- a/sharding-jdbc-doc/content/00-overview/intro.md
+++ b/sharding-jdbc-doc/content/00-overview/intro.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "简介"
weight = 1
-prev = "/00-overview"
-next = "/00-overview/release-notes"
+prev = "/00-overview/index/"
+next = "/00-overview/release-notes/"
+++
diff --git a/sharding-jdbc-doc/content/00-overview/release-notes.md b/sharding-jdbc-doc/content/00-overview/release-notes.md
index 147539d7d689aa8408601fc026cd5322fdd6eb0e..db7e8ea9d7e6c10e7518aa78f886150e62257273 100644
--- a/sharding-jdbc-doc/content/00-overview/release-notes.md
+++ b/sharding-jdbc-doc/content/00-overview/release-notes.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "Release Notes"
weight = 2
-prev = "/00-overview/intro"
-next = "/00-overview/contribution"
+prev = "/00-overview/intro/"
+next = "/00-overview/contribution/"
+++
diff --git a/sharding-jdbc-doc/content/01-start/faq.md b/sharding-jdbc-doc/content/01-start/faq.md
index ee1b353f2e7b03b72bbb0221de54aea20b584651..946a4dd965bfa1f48b308b06418313642436a81f 100644
--- a/sharding-jdbc-doc/content/01-start/faq.md
+++ b/sharding-jdbc-doc/content/01-start/faq.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "FAQ"
weight = 2
-prev = "/01-start/quick-start"
-next = "/01-start/features"
+prev = "/01-start/quick-start/"
+next = "/01-start/features/"
+++
@@ -14,7 +14,13 @@ next = "/01-start/features"
Sharding-JDBC使用lombok实现极简代码。关于更多使用和安装细节,请参考[lombok官网](https://projectlombok.org/download.html)。
-### 2. 使用Spring命名空间时在网上相应地址找不到xsd?
+### 2. java.lang.NoSuchMethodError:com.alibaba.druid.sql.ast.expr.SQLAggregateExpr.getOption().....异常的解决方法?
+
+回答:
+
+目前Sharding-JDBC使用Druid作为SQL解析的基础库,请确保业务代码中使用的Druid与Sharding-JDBC使用的版本一致,目前Sharding-JDBC使用的是`1.0.12`版本。
+
+### 3. 使用Spring命名空间时在网上相应地址找不到xsd?
回答:
@@ -22,7 +28,7 @@ Spring命名空间使用规范并未强制要求将xsd文件部署至公网地
sharding-jdbc-config-spring的jar包中`META-INF\spring.schemas`配置了xsd文件的位置:`META-INF\namespace\rdb.xsd`,需确保jar包中该文件存在。
-### 3. Cloud not resolve placeholder ... in string value ...异常的解决方法?
+### 4. Cloud not resolve placeholder ... in string value ...异常的解决方法?
回答:
@@ -32,9 +38,10 @@ sharding-jdbc-config-spring的jar包中`META-INF\spring.schemas`配置了xsd文
```
-### 4. inline表达式返回结果为何出现浮点数?
+### 5. inline表达式返回结果为何出现浮点数?
回答:
Java的整数相除结果是整数,但是对于inline表达式中的Groovy语法则不同,整数相除结果是浮点数。
想获得除法整数结果需要将A/B改为A.intdiv(B)。
+
diff --git a/sharding-jdbc-doc/content/01-start/features.md b/sharding-jdbc-doc/content/01-start/features.md
index 1a36ca6d00ea0fd01319ce9595e630dcc984ad6b..28969d5c648e9fcbeb0f77aa0093d6a7723c57b6 100644
--- a/sharding-jdbc-doc/content/01-start/features.md
+++ b/sharding-jdbc-doc/content/01-start/features.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "详细功能列表"
weight = 3
-prev = "/01-start/faq"
-next = "/01-start/limitations"
+prev = "/01-start/faq/"
+next = "/01-start/limitations/"
+++
diff --git a/sharding-jdbc-doc/content/01-start/index.md b/sharding-jdbc-doc/content/01-start/index.md
index 1bc3bc3888fdb995af71ad251ade17a1936aa11b..a73a3891aac43e0df97abf5446c8bf38eb597e63 100644
--- a/sharding-jdbc-doc/content/01-start/index.md
+++ b/sharding-jdbc-doc/content/01-start/index.md
@@ -3,16 +3,16 @@ icon = "1. "
date = "2016-12-02T16:06:17+08:00"
title = "起航"
weight = 0
-prev = "/00-overview/release-notes"
-next = "/01-start/quick-start"
+prev = "/00-overview/contribution/"
+next = "/01-start/quick-start/"
chapter = true
+++
# 本章导航
- - 如果想快速体验Sharding-JDBC的强大功能,请阅读[快速入门](/01-start/quick-start)。
- - 如果在使用中遇到什么问题,请首先在[FAQ](/01-start/faq)中寻找解决问题的答案。
- - 想要在自己的项目中集成Sharding-JDBC,您一定很关心它[能做什么](/01-start/features)和[不能做什么](/01-start/limitations)。
- - 数据库中间件一般都不会支持完全的SQL语法,在这里能了解到[支持的SQL语法](/01-start/sql-supported)。
- - 最后,你会关心中间件的性能情况。这里将展示我们的[性能测试结果](/01-start/stress-test)。
+ - 如果想快速体验Sharding-JDBC的强大功能,请阅读[快速入门](/01-start/quick-start/)。
+ - 如果在使用中遇到什么问题,请首先在[FAQ](/01-start/faq/)中寻找解决问题的答案。
+ - 想要在自己的项目中集成Sharding-JDBC,您一定很关心它[能做什么](/01-start/features)和[不能做什么](/01-start/limitations/)。
+ - 数据库中间件一般都不会支持完全的SQL语法,在这里能了解到[支持的SQL语法](/01-start/sql-supported/)。
+ - 最后,你会关心中间件的性能情况。这里将展示我们的[性能测试结果](/01-start/stress-test/)。
diff --git a/sharding-jdbc-doc/content/01-start/quick-start.md b/sharding-jdbc-doc/content/01-start/quick-start.md
index 900af8a358d3d120d94c3f9919ea9f0b3c2e0fa0..762f6b61d25b0b07996b541c5b21e6c67407dc33 100644
--- a/sharding-jdbc-doc/content/01-start/quick-start.md
+++ b/sharding-jdbc-doc/content/01-start/quick-start.md
@@ -115,4 +115,4 @@ try (
```
->详细的规则配置请参考[配置指南](/02-guide/configuration)
\ No newline at end of file
+>详细的规则配置请参考[配置手册](/02-guide/configuration)
\ No newline at end of file
diff --git a/sharding-jdbc-doc/content/02-guide/concepts.md b/sharding-jdbc-doc/content/02-guide/concepts.md
index 01e40af9a9964d0bcc239f323f67fd21ced9b1ca..24957c0d97c31589db18c320df8b0013349f05d6 100644
--- a/sharding-jdbc-doc/content/02-guide/concepts.md
+++ b/sharding-jdbc-doc/content/02-guide/concepts.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "核心概念"
weight = 1
-prev = "/02-guide"
-next = "/02-guide/sharding"
+prev = "/02-guide/index/"
+next = "/02-guide/sharding/"
+++
diff --git a/sharding-jdbc-doc/content/02-guide/configuration.md b/sharding-jdbc-doc/content/02-guide/configuration.md
index dfe4da0fe7af38fbf94ec6eab585114636d817b2..a19681ddb637c722ac52890e9040e408780b01c8 100644
--- a/sharding-jdbc-doc/content/02-guide/configuration.md
+++ b/sharding-jdbc-doc/content/02-guide/configuration.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "配置手册"
weight = 5
-prev = "/02-guide/master-slave"
-next = "/02-guide/hint-sharding-value"
+prev = "/02-guide/master-slave/"
+next = "/02-guide/hint-sharding-value/"
+++
diff --git a/sharding-jdbc-doc/content/02-guide/index.md b/sharding-jdbc-doc/content/02-guide/index.md
index 3a72b577058bdcb52266b912a35fd29025a480c1..a397af5f31b6c7ad8b68229f21e0679a68fb1d0b 100644
--- a/sharding-jdbc-doc/content/02-guide/index.md
+++ b/sharding-jdbc-doc/content/02-guide/index.md
@@ -11,10 +11,10 @@ chapter = true
# 本章导航
- - 想一览基本的概念,请阅读[基本概念](/02-guide/concepts)。
- - 想通过一个完整的例子使用Sharding-JDBC进行分库分表,请阅读[如何分库分表](/02-guide/sharding)章节。
- - 分库分表后,要进一步提高性能,可以使用[读写分离](/02-guide/master-slave)功能。
- - [使用配置文件](/02-guide/configuration)介绍了如何通过YAML和Spring两种方式配置。
- - 一般情况Sharding-JDBC是通过SQL解析来获取数据路由数据的,但也可以使用[强制路由](/02-guide/hint-sharding-value)方式来设置分片数据。该模式非常适合存量系统扩容。
- - 分库分表后主键如何生成?[分布式主键](/02-guide/id-generator)将给你答案。
- - 分库后事务如何保证?[事务支持](/02-guide/transaction)将介绍Sharding-JDBC如何通过使用柔性事务的方式来实现分布式事务。
+ - 想一览基本的概念,请阅读[基本概念](/02-guide/concepts/)。
+ - 想通过一个完整的例子使用Sharding-JDBC进行分库分表,请阅读[如何分库分表](/02-guide/sharding/)章节。
+ - 分库分表后,要进一步提高性能,可以使用[读写分离](/02-guide/master-slave/)功能。
+ - [配置手册](/02-guide/configuration/)介绍了如何通过YAML和Spring两种方式配置。
+ - 一般情况Sharding-JDBC是通过SQL解析来获取数据路由数据的,但也可以使用[强制路由](/02-guide/hint-sharding-value/)方式来设置分片数据。该模式非常适合存量系统扩容。
+ - 分库分表后主键如何生成?[分布式主键](/02-guide/id-generator/)将给你答案。
+ - 分库后事务如何保证?[事务支持](/02-guide/transaction/)将介绍Sharding-JDBC如何通过使用柔性事务的方式来实现分布式事务。
diff --git a/sharding-jdbc-doc/content/02-guide/master-slave.md b/sharding-jdbc-doc/content/02-guide/master-slave.md
index 6badfeaba1b12d3610cb8d23a78e055763ae48bb..894b09941eaf039652ec8c31e4bc0f405c8347ce 100644
--- a/sharding-jdbc-doc/content/02-guide/master-slave.md
+++ b/sharding-jdbc-doc/content/02-guide/master-slave.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "读写分离"
weight = 3
-prev = "/02-guide/sharding"
-next = "/02-guide/configuration"
+prev = "/02-guide/sharding/"
+next = "/02-guide/configuration/"
+++
diff --git a/sharding-jdbc-doc/content/02-guide/sharding.md b/sharding-jdbc-doc/content/02-guide/sharding.md
index 152e6e0399a95d764613e68e0c7d189f2f7881f9..5d600f543afc5c4adca39608317aa36e3f06e4f7 100644
--- a/sharding-jdbc-doc/content/02-guide/sharding.md
+++ b/sharding-jdbc-doc/content/02-guide/sharding.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "分库分表"
weight = 2
-prev = "/02-guide/concepts"
-next = "/02-guide/master-slave"
+prev = "/02-guide/concepts/"
+next = "/02-guide/master-slave/"
+++
diff --git a/sharding-jdbc-doc/content/02-guide/transaction.md b/sharding-jdbc-doc/content/02-guide/transaction.md
index 895d2876c6f8f0c273e32e4aaa44685058b891ac..60d1f3767060ef9a314e34b1b6b0ca98abeb5a44 100644
--- a/sharding-jdbc-doc/content/02-guide/transaction.md
+++ b/sharding-jdbc-doc/content/02-guide/transaction.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "事务支持"
weight = 8
-prev = "/02-guide/master-slave"
-next = "/03-design"
+prev = "/02-guide/id-generator/"
+next = "/03-design/index/"
+++
diff --git a/sharding-jdbc-doc/content/03-design/architecture.md b/sharding-jdbc-doc/content/03-design/architecture.md
index 14471b35243141c68eaa4ff0ca142f900093a138..b23f056466498c8f3d6ddd02b6a206e77179ac00 100644
--- a/sharding-jdbc-doc/content/03-design/architecture.md
+++ b/sharding-jdbc-doc/content/03-design/architecture.md
@@ -3,18 +3,18 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "架构设计"
weight = 1
-prev = "/03-design"
-next = "/03-design/module"
+prev = "/03-design/index/"
+next = "/03-design/module/"
+++
-![整体架构图](../../img/architecture.png)
+![整体架构图](/img/architecture.png)
-![SQL解析](../../img/parse.png)
+![SQL解析](/img/parse.png)
-![SQL路由](../../img/route.png)
+![SQL路由](/img/route.png)
-![SQL执行](../../img/execute.png)
+![SQL执行](/img/execute.png)
-![结果归并](../../img/merge.png)
+![结果归并](/img/merge.png)
diff --git a/sharding-jdbc-doc/content/03-design/index.md b/sharding-jdbc-doc/content/03-design/index.md
index 5f453d8956e38f7cd29306b37303db4eb9ed1659..6004365b667cb64c4878f9afd18b6537383a7a89 100644
--- a/sharding-jdbc-doc/content/03-design/index.md
+++ b/sharding-jdbc-doc/content/03-design/index.md
@@ -3,13 +3,13 @@ icon = "3. "
date = "2016-12-12T16:06:17+08:00"
title = "设计规划"
weight = 0
-prev = "/02-guide/soft-transaction"
-next = "/03-design/architecture"
+prev = "/02-guide/transaction/"
+next = "/03-design/architecture/"
chapter = true
+++
# 本章导航
- - 想了解架构设计及项目模块设计的概念,请阅读[架构设计](/03-design/architecture)及[目录结构说明](/03-design/module)。
- - Sharding-JDBC未来规划有哪些呢?请阅读[未来规划](/03-design/roadmap)。
\ No newline at end of file
+ - 想了解架构设计及项目模块设计的概念,请阅读[架构设计](/03-design/architecture/)及[目录结构说明](/03-design/module/)。
+ - Sharding-JDBC未来规划有哪些呢?请阅读[未来规划](/03-design/roadmap/)。
\ No newline at end of file
diff --git a/sharding-jdbc-doc/content/03-design/module.md b/sharding-jdbc-doc/content/03-design/module.md
index 90230bba7e52dbf80fe8c05dd48544c826c73d70..c905bad7576373aaeef027c588f2e71eb177d127 100644
--- a/sharding-jdbc-doc/content/03-design/module.md
+++ b/sharding-jdbc-doc/content/03-design/module.md
@@ -3,8 +3,8 @@ toc = true
date = "2016-12-06T22:38:50+08:00"
title = "目录结构说明"
weight = 3
-prev = "/03-design/architecture"
-next = "/03-design/roadmap"
+prev = "/03-design/architecture/"
+next = "/03-design/roadmap/"
+++
diff --git a/sharding-jdbc-doc/content/03-design/roadmap.md b/sharding-jdbc-doc/content/03-design/roadmap.md
index bb37ec4588afc9a4400e7747aca1075eca86b722..9ff40297a67accfd2b852562a7eead6c6cbea0f4 100644
--- a/sharding-jdbc-doc/content/03-design/roadmap.md
+++ b/sharding-jdbc-doc/content/03-design/roadmap.md
@@ -5,7 +5,6 @@ title = "未来线路规划"
weight = 4
prev = "/03-design/module"
next = "/00-overview"
-
+++
## 已完成