Commit dc866f86 authored by junxiong's avatar junxiong
Browse files

#428 merge with dev branch

parents 093afed0 a4a4dae3

README.md

+4 −4
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ 
# [中文主页](http://shardingjdbc.io/index_zh.html)



[![Build Status](https://secure.travis-ci.org/shardingjdbc/sharding-jdbc.png?branch=master)](https://travis-ci.org/dangdangdotcom/sharding-jdbc)

[![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)

[![Maven Status](https://maven-badges.herokuapp.com/maven-central/io.shardingjdbc/sharding-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.shardingjdbc/sharding-jdbc)

[![Coverage Status](https://coveralls.io/repos/shardingjdbc/sharding-jdbc/badge.svg?branch=master&service=github)](https://coveralls.io/github/shardingjdbc/sharding-jdbc?branch=master)

[![GitHub release](https://img.shields.io/github/release/shardingjdbc/sharding-jdbc.svg)](https://github.com/shardingjdbc/sharding-jdbc/releases)

[![Hex.pm](http://shardingjdbc.github.io/sharding-jdbc/img/license.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)

[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)



# Overview
@@ -52,7 +52,7 @@ Sharding-JDBC is a JDBC extension, provides distributed features such as shardin 


# Architecture



![Architecture](http://ovfotjrsi.bkt.clouddn.com/docs/img/architecture_en.png)

![Architecture](http://ovfotjrsi.bkt.clouddn.com/docs/img/architecture_en_v2.png)



# [Release Notes](https://github.com/shardingjdbc/sharding-jdbc/releases)
@@ -79,7 +79,7 @@ Sharding-JDBC is a JDBC extension, provides distributed features such as shardin 
    Map<String, DataSource> dataSourceMap = new HashMap<>();

    

    BasicDataSource dataSource1 = new BasicDataSource();

    dataSource2.setDriverClassName("com.mysql.jdbc.Driver");

    dataSource1.setDriverClassName("com.mysql.jdbc.Driver");

    dataSource1.setUrl("jdbc:mysql://localhost:3306/ds_0");

    dataSource1.setUsername("root");

    dataSource1.setPassword("");

README_ZH.md

+5 −5
Original line number Diff line number Diff line 
# Sharding-JDBC - 为分库分表而生的数据库访问层微服务框架 



[![Build Status](https://secure.travis-ci.org/dangdangdotcom/sharding-jdbc.png?branch=master)](https://travis-ci.org/dangdangdotcom/sharding-jdbc)

[![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/shardingjdbc/sharding-jdbc.png?branch=master)](https://travis-ci.org/dangdangdotcom/sharding-jdbc)

[![Maven Status](https://maven-badges.herokuapp.com/maven-central/io.shardingjdbc/sharding-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.shardingjdbc/sharding-jdbc)

[![Coverage Status](https://coveralls.io/repos/shardingjdbc/sharding-jdbc/badge.svg?branch=master&service=github)](https://coveralls.io/github/shardingjdbc/sharding-jdbc?branch=master)

[![GitHub release](https://img.shields.io/github/release/shardingjdbc/sharding-jdbc.svg)](https://github.com/shardingjdbc/sharding-jdbc/releases)

[![Hex.pm](http://shardingjdbc.github.io/sharding-jdbc/img/license.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)

[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)





# [中文主页](http://shardingjdbc.io/index_zh.html)
@@ -51,7 +51,7 @@ Sharding-JDBC定位为轻量级java框架，使用客户端直连数据库，以 


# Architecture



![Architecture](http://ovfotjrsi.bkt.clouddn.com/docs/img/architecture.png)

![Architecture](http://ovfotjrsi.bkt.clouddn.com/docs/img/architecture_v2.png)



# [Release Notes](https://github.com/shardingjdbc/sharding-jdbc/releases)
@@ -80,7 +80,7 @@ Sharding-JDBC的分库分表通过规则配置描述，请简单浏览配置全 
    

    // 配置第一个数据源

    BasicDataSource dataSource1 = new BasicDataSource();

    dataSource2.setDriverClassName("com.mysql.jdbc.Driver");

    dataSource1.setDriverClassName("com.mysql.jdbc.Driver");

    dataSource1.setUrl("jdbc:mysql://localhost:3306/ds_0");

    dataSource1.setUsername("root");

    dataSource1.setPassword("");

RELEASE-NOTES.md

+10 −0
Original line number Diff line number Diff line 
## 2.0.0.M3



### 里程碑



1. 读写分离从库治理，可以禁用从库的访问

1. ConfigMap支持，可以在分片和读写分离策略中获取预定义的元数据



### 缺陷修正



1. [ISSUE #436](https://github.com/shardingjdbc/sharding-jdbc/issues/436) 读写分离多从库配置RoundRobin算法并使用MyBatis时，只能路由到同一从库

1. [ISSUE #452](https://github.com/shardingjdbc/sharding-jdbc/issues/452) DDL语句分片至多个表会造成连接泄漏的问题



## 2.0.0.M2



### 里程碑

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
    <modelVersion>4.0.0</modelVersion>

    <groupId>io.shardingjdbc</groupId>

    <artifactId>sharding-jdbc</artifactId>

    <version>2.0.0.M3-SNAPSHOT</version>

    <version>2.0.0.M4-SNAPSHOT</version>

    <packaging>pom</packaging>

    <name>${project.artifactId}</name>

sharding-jdbc-core/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    <parent>

        <groupId>io.shardingjdbc</groupId>

        <artifactId>sharding-jdbc</artifactId>

        <version>2.0.0.M3-SNAPSHOT</version>

        <version>2.0.0.M4-SNAPSHOT</version>

    </parent>

    <artifactId>sharding-jdbc-core</artifactId>

    <name>${project.artifactId}</name>