update pages

xuse · Jan 18, 2016 · 8c80cc3 · 8c80cc3
2 parents 48b049c + d2aa9f5
commit 8c80cc3
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,15 @@ logs/
 *.diff
 *.patch
 *.tmp
+<<<<<<< HEAD
 
 # system ignore
 .DS_Store
 Thumbs.db
+=======
+
+# system ignore
+.DS_Store
+Thumbs.db
+
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
diff --git a/README.md b/README.md
@@ -1,14 +1,28 @@
+<<<<<<< HEAD
+=======
+`Sharding-JDBC`是当当应用框架`ddframe`中，关系型数据库模块`dd-rdb`中分离出来的数据库水平扩展框架，即透明化数据库分库分表访问。
+`Sharding-JDBC`继`dubbox`和`elastic-job`之后，是`ddframe`系列开源的第三个产品。
+
+[![Hex.pm](http://dangdangdotcom.github.io/elastic-job/images/license.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
 # 主要贡献者
 
 * 张亮 &nbsp;&nbsp;&nbsp;[当当](http://www.dangdang.com/) [email protected]
 * 高洪涛 [当当](http://www.dangdang.com/) [email protected]
 * 曹昊 &nbsp;&nbsp;&nbsp;[当当](http://www.dangdang.com/) [email protected]
 * 岳令 &nbsp;&nbsp;&nbsp;[当当](http://www.dangdang.com/) [email protected]
 
+<<<<<<< HEAD
 **讨论QQ群：**xxx（不限于Sharding-JDBC，包括分布式，数据库相关以及其他互联网技术交流）
 
 # 简介
 `Sharding-JDBC`是当当应用框架`ddframe`中，关系型数据库模块`dd-rdb`中分离出来的数据库水平扩展框架，即透明化数据库分库分表访问。
+=======
+**讨论QQ群：**532576663（不限于Sharding-JDBC，包括分布式，数据库相关以及其他互联网技术交流）
+
+# 简介
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
 
 `Sharding-JDBC`直接封装`JDBC API`，可以理解为增强版的`JDBC`驱动，旧代码迁移成本几乎为零：
 
@@ -41,11 +55,31 @@
 
 # 整体架构图
 
+<<<<<<< HEAD
 ![整体架构图1](../img/architecture.png)
 
 # Quick Start
 
 ## 引入maven依赖
+=======
+![整体架构图1](http://dangdangdotcom.github.io/sharding-jdbc/img/architecture.png)
+
+# 相关文档
+
+[使用指南](http://dangdangdotcom.github.io/sharding-jdbc/post/user_guide/)
+
+[详细功能列表](http://dangdangdotcom.github.io/sharding-jdbc/post/features/)
+
+[架构图](http://dangdangdotcom.github.io/sharding-jdbc/post/architecture/)
+
+[使用限制](http://dangdangdotcom.github.io/sharding-jdbc/post/restriction/)
+
+[未来线路规划](http://dangdangdotcom.github.io/sharding-jdbc/post/roadmap/)
+
+# Quick Start
+
+## 引入maven依赖(暂时还未放入中央仓库，等稳定后再部署)
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
 ```xml
 <!-- 引入sharding-jdbc核心模块 -->
 <dependency>

diff --git a/sharding-jdbc-doc/config.toml b/sharding-jdbc-doc/config.toml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 baseurl = "http://dangdangdotcom.github.io/sharding-jdbc"
+=======
+baseurl = "http://dangdangdotcom.github.io"
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
 languageCode = "en-us"
 title = "Sharding-JDBC"
 

diff --git a/sharding-jdbc-doc/content/index/index.md b/sharding-jdbc-doc/content/index/index.md
@@ -46,7 +46,11 @@ index = true
 
 # 整体架构图
 
+<<<<<<< HEAD
 ![整体架构图1](img/architecture.png)
+=======
+![整体架构图1](../img/architecture.png)
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
 
 # Quick Start
 

diff --git a/sharding-jdbc-doc/content/post/architecture.md b/sharding-jdbc-doc/content/post/architecture.md
@@ -5,6 +5,7 @@ weight=4
 +++
 # 架构图
 
+<<<<<<< HEAD
 ![整体架构图1](img/architecture.png)
 
 ![SQL解析](img/parse.png)
@@ -14,3 +15,14 @@ weight=4
 ![SQL执行](img/execute.png)
 
 ![结果归并](img/merge.png)
+=======
+![整体架构图1](../img/architecture.png)
+
+![SQL解析](../img/parse.png)
+
+![SQL路由](../img/route.png)
+
+![SQL执行](../img/execute.png)
+
+![结果归并](../img/merge.png)
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
diff --git a/sharding-jdbc-doc/content/post/user_guide.md b/sharding-jdbc-doc/content/post/user_guide.md
@@ -110,7 +110,11 @@ private static DataSource createDataSource(final String dataSourceName) {
 
 ## 策略配置
 ### 数据源策略与表策略
+<<<<<<< HEAD
 ![策略类图](img/StrategyClass.900.png)
+=======
+![策略类图](/img/StrategyClass.900.png)
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
 Sharding-JDBC认为对于分片策略存有两种维度
 - 数据源分片策略`DatabaseShardingStrategy`：数据被分配的目标数据源
 - 表分片策略`TableShardingStrategy`：数据被分配的目标表，该目标表存在与该数据的目标数据源内。故表分片策略是依赖与数据源分片策略的结果的
@@ -164,7 +168,11 @@ new TableShardingStrategy(Arrays.asList("order_id"，"order_type", "order_date")
 
 ### 分片算法
 分片算法接口类图关系如下：
+<<<<<<< HEAD
 ![算法](img/AlgorithmClass.900.png)
+=======
+![算法](/img/AlgorithmClass.900.png)
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
 
 ### 绑定表
 绑定表代表一组表，这组表的逻辑表与实际表之间的映射关系是相同的。比如`t_order`与`t_order_item`就是这样一组绑定表关系,它们的分库与分表策略是完全相同的,那么可以使用它们的表规则将它们配置成绑定表

diff --git a/sharding-jdbc-doc/layouts/partials/head.html b/sharding-jdbc-doc/layouts/partials/head.html
@@ -6,21 +6,35 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
+<<<<<<< HEAD
     <base href="/sharding-jdbc/"/>
     <title>{{ .Title }}</title>
     <!-- Bootstrap Core CSS -->
     <link href="//cdn.bootcss.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom CSS -->
     <link href="css/landing-page.css" rel="stylesheet">
+=======
+    <title>{{ .Title }}</title>
+    <!-- Bootstrap Core CSS -->
+    <link href="/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom CSS -->
+    <link href="/css/landing-page.css" rel="stylesheet">
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
 
     <!-- Custom Fonts -->
     <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
 
     <style>
     {{ printf "%v" (partial "template.css" . ) | safeCSS  }}
   </style>
+<<<<<<< HEAD
     <link href="css/prism.css" rel="stylesheet">
     <link href="css/table.css" rel="stylesheet">
+=======
+    <link href="/css/prism.css" rel="stylesheet">
+    <link href="/css/table.css" rel="stylesheet">
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70
 </head>
 <body>
diff --git a/sharding-jdbc-doc/layouts/partials/js.html b/sharding-jdbc-doc/layouts/partials/js.html
@@ -1,4 +1,5 @@
 <!-- jQuery Version 1.11.0 -->
+<<<<<<< HEAD
 <script src="//cdn.bootcss.com/jquery/1.12.0/jquery.min.js"></script>5
 
 <!-- Plugin JavaScript -->
@@ -9,3 +10,32 @@
 
 <!-- Custom Theme JavaScript -->
 <script src="js/prism.js"></script>
+=======
+<script src="/js/jquery-1.11.0.js"></script>
+
+<!-- Plugin JavaScript -->
+<script src="/js/jquery.easing.min.js"></script>
+
+<!-- Bootstrap Core JavaScript -->
+<script src="/js/bootstrap.min.js"></script>
+
+<!-- Custom Theme JavaScript -->
+<script src="js/landing-page.js"></script>
+<script src="/js/prism.js"></script>
+
+{{ if isset .Site.Params "googleAnalytics" }}
+
+<!-- Google Analytics -->
+<!--<script>-->
+	<!--(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){-->
+		<!--(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new-->
+		<!--Date();a=s.createElement(o),-->
+		<!--m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)-->
+	<!--})(window,document,'script','//www.google-analytics.com/analytics.js','ga');-->
+
+	<!--ga('create', '{{ .Site.Params.googleAnalytics }}', 'auto');-->
+	<!--ga('send', 'pageview');-->
+<!--</script>-->
+
+{{ end }}
+>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70