diff --git a/pictures/spring-druid-mybatis-annotation.png b/pictures/spring-druid-mybatis-annotation.png
new file mode 100644
index 0000000..7cd1c10
Binary files /dev/null and b/pictures/spring-druid-mybatis-annotation.png differ
diff --git a/pictures/spring-druid-mybatis.png b/pictures/spring-druid-mybatis.png
new file mode 100644
index 0000000..d99b430
Binary files /dev/null and b/pictures/spring-druid-mybatis.png differ
diff --git a/pictures/spring-jdbc-annotation.png b/pictures/spring-jdbc-annotation.png
new file mode 100644
index 0000000..a291c22
Binary files /dev/null and b/pictures/spring-jdbc-annotation.png differ
diff --git a/pictures/spring-jdbc.png b/pictures/spring-jdbc.png
new file mode 100644
index 0000000..d8d23ea
Binary files /dev/null and b/pictures/spring-jdbc.png differ
diff --git a/pictures/spring-mybatis-annotation.png b/pictures/spring-mybatis-annotation.png
new file mode 100644
index 0000000..3b1119e
Binary files /dev/null and b/pictures/spring-mybatis-annotation.png differ
diff --git a/pictures/spring-mybatis.png b/pictures/spring-mybatis.png
new file mode 100644
index 0000000..eb2f781
Binary files /dev/null and b/pictures/spring-mybatis.png differ
diff --git a/spring/spring-druid-mybatis-annotation/README.md b/spring/spring-druid-mybatis-annotation/README.md
index b69852a..34694ca 100644
--- a/spring/spring-druid-mybatis-annotation/README.md
+++ b/spring/spring-druid-mybatis-annotation/README.md
@@ -1,112 +1,48 @@
-# spring +druid+ mybatis(注解配置方式)
+# spring +druid+ mybatis(注解方式)
-1、创建标准web maven工程,导入依赖
+### 项目目录结构
+
+
+
+#### 1、创建maven工程,除了Spring基本依赖外,还需要导入mybatis和druid的相关依赖
```xml
-
-
- 4.0.0
-
- com.heibaiying
+
+
+ org.springframework
spring-jdbc
- 1.0-SNAPSHOT
-
- 5.1.3.RELEASE
-
-
-
-
-
- org.springframework
- spring-context
- ${spring-base-version}
-
-
- org.springframework
- spring-beans
- ${spring-base-version}
-
-
- org.springframework
- spring-core
- ${spring-base-version}
-
-
- org.springframework
- spring-web
- ${spring-base-version}
-
-
- org.springframework
- spring-webmvc
- ${spring-base-version}
-
-
- javax.servlet
- javax.servlet-api
- 4.0.1
- provided
-
-
- org.projectlombok
- lombok
- 1.18.4
- provided
-
-
-
- org.springframework
- spring-jdbc
- ${spring-base-version}
-
-
- mysql
- mysql-connector-java
- 8.0.13
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.springframework
- spring-test
- ${spring-base-version}
- test
-
-
- com.oracle
- ojdbc6
- 11.2.0.3.0
-
-
-
- org.mybatis
- mybatis-spring
- 1.3.2
-
-
- org.mybatis
- mybatis
- 3.4.6
-
-
-
- com.alibaba
- druid
- 1.1.12
-
-
-
-
+ ${spring-base-version}
+
+
+ mysql
+ mysql-connector-java
+ 8.0.13
+
+
+ com.oracle
+ ojdbc6
+ 11.2.0.3.0
+
+
+
+ org.mybatis
+ mybatis-spring
+ 1.3.2
+
+
+ org.mybatis
+ mybatis
+ 3.4.6
+
+
+
+ com.alibaba
+ druid
+ 1.1.12
+
```
-2、新建 DispatcherServletInitializer.java继承自AbstractAnnotationConfigDispatcherServletInitializer,等价于我们在web.xml中配置的前端控制器
+#### 2、新建 DispatcherServletInitializer.java继承自AbstractAnnotationConfigDispatcherServletInitializer,等价于我们在web.xml中配置的前端控制器
```java
public class DispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
@@ -125,18 +61,11 @@ public class DispatcherServletInitializer extends AbstractAnnotationConfigDispat
}
```
-3、基础servlet 3.0的支持,可以采用注解的方式注册druid的servlet和filter
+#### 3、基础servlet 3.0的支持,可以采用注解的方式注册druid的servlet和filter
- 注:关于servlet 注解支持可以查看[Servlet 规范文档](https://github.com/heibaiying/spring-samples-for-all/blob/master/referenced%20documents/Servlet3.1%E8%A7%84%E8%8C%83%EF%BC%88%E6%9C%80%E7%BB%88%E7%89%88%EF%BC%89.pdf)中**8.1小节 注解和可插拔性**
+ 注:关于servlet 更多注解支持可以查看[Servlet 规范文档](https://github.com/heibaiying/spring-samples-for-all/blob/master/referenced%20documents/Servlet3.1%E8%A7%84%E8%8C%83%EF%BC%88%E6%9C%80%E7%BB%88%E7%89%88%EF%BC%89.pdf)中**8.1小节 注解和可插拔性**
```java
-package com.heibaiying.config.druid;
-
-import com.alibaba.druid.support.http.StatViewServlet;
-
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
-
/**
* @author : heibaiying
* @description : 配置监控页面用户名密码
@@ -153,12 +82,6 @@ public class DruidStatViewServlet extends StatViewServlet {
```
```java
-package com.heibaiying.config.druid;
-
-import com.alibaba.druid.support.http.WebStatFilter;
-
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
/**
* @author : heibaiying
@@ -175,7 +98,7 @@ public class DruidStatFilter extends WebStatFilter {
```
-4、在resources文件夹下新建数据库配置文件mysql.properties、oracle.properties
+#### 4、在resources文件夹下新建数据库配置文件mysql.properties、oracle.properties
```properties
# mysql 数据库配置
@@ -193,21 +116,9 @@ oracle.username=用户名
oracle.password=密码
```
-5、在新建数据库配置映射类DataSourceConfig.java
+#### 5、在新建数据库配置映射类DataSourceConfig.java
```java
-package com.heibaiying.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@Configuration
@PropertySource(value = "classpath:mysql.properties")
@Data
@@ -226,30 +137,9 @@ public class DataSourceConfig {
```
-6、新建ServletConfig.java,进行数据库相关配置
+#### 6、新建ServletConfig.java,进行数据库相关配置
```java
-package com.heibaiying.config;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.io.IOException;
-import java.sql.SQLException;
-
-;
-
-
/**
* @author : heibaiying
*/
@@ -351,7 +241,7 @@ public class ServletConfig implements WebMvcConfigurer {
```
-7、新建mybtais 配置文件 更多settings配置项可以参考[官方文档](http://www.mybatis.org/mybatis-3/zh/configuration.html)
+#### 7、新建mybtais 配置文件,按需要进行额外参数配置, 更多settings配置项可以参考[官方文档](http://www.mybatis.org/mybatis-3/zh/configuration.html)
```xml
@@ -374,7 +264,7 @@ public class ServletConfig implements WebMvcConfigurer {
```
-8、新建查询接口及其对应的mapper文件
+#### 8、新建查询接口及其对应的mapper文件
```java
public interface MysqlDao {
@@ -421,25 +311,9 @@ public interface OracleDao {
```
-9.新建测试controller进行测试
+#### 9.新建测试controller进行测试
```java
-package com.heibaiying.controller;
-
-import com.heibaiying.bean.Relation;
-import com.heibaiying.dao.MysqlDao;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RestController
public class MysqlController {
@@ -455,19 +329,6 @@ public class MysqlController {
```
```java
-package com.heibaiying.controller;
-
-import com.heibaiying.dao.OracleDao;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RestController
public class OracleController {
@@ -482,7 +343,7 @@ public class OracleController {
```
-10、druid 监控页面访问地址http://localhost:8080/druid/index.html
+#### 10、druid 监控页面访问地址http://localhost:8080/druid/index.html

diff --git a/spring/spring-druid-mybatis-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java b/spring/spring-druid-mybatis-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java
index 51dd508..1c73d88 100644
--- a/spring/spring-druid-mybatis-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java
+++ b/spring/spring-druid-mybatis-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java
@@ -15,12 +15,6 @@ import org.springframework.context.annotation.PropertySource;
@Data
public class DataSourceConfig {
- /**
- * 感觉这种注入的方式并不够好
- * 没有spring-boot中使用@ConfigurationProperties(prefix = "config")指定前缀注入的方式优雅
- */
- @Value("${mysql.driverClassName}")
- private String driverClassName;
@Value("${mysql.url}")
private String url;
@Value("${mysql.username}")
diff --git a/spring/spring-druid-mybatis-annotation/src/main/resources/mysql.properties b/spring/spring-druid-mybatis-annotation/src/main/resources/mysql.properties
index e860927..973f6a0 100644
--- a/spring/spring-druid-mybatis-annotation/src/main/resources/mysql.properties
+++ b/spring/spring-druid-mybatis-annotation/src/main/resources/mysql.properties
@@ -1,4 +1,4 @@
# mysql ݿ
-mysql.url=jdbc:mysql://localhost:3306/mysql
+mysql.url=jdbc:mysql://localhost:3306/mysql?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
mysql.username=root
mysql.password=root
diff --git a/spring/spring-druid-mybatis/README.md b/spring/spring-druid-mybatis/README.md
index a7a243b..9b84fff 100644
--- a/spring/spring-druid-mybatis/README.md
+++ b/spring/spring-druid-mybatis/README.md
@@ -1,112 +1,48 @@
# spring +druid+ mybatis(xml配置方式)
-#### 1、创建标准web maven工程,导入依赖
+### 项目目录结构
+
+
+
+#### 1、创建maven工程,除了Spring基本依赖外,还需要导入mybatis和druid的相关依赖
```xml
-
-
- 4.0.0
-
- com.heibaiying
+
+
+ org.springframework
spring-jdbc
- 1.0-SNAPSHOT
-
- 5.1.3.RELEASE
-
-
-
-
-
- org.springframework
- spring-context
- ${spring-base-version}
-
-
- org.springframework
- spring-beans
- ${spring-base-version}
-
-
- org.springframework
- spring-core
- ${spring-base-version}
-
-
- org.springframework
- spring-web
- ${spring-base-version}
-
-
- org.springframework
- spring-webmvc
- ${spring-base-version}
-
-
- javax.servlet
- javax.servlet-api
- 4.0.1
- provided
-
-
- org.projectlombok
- lombok
- 1.18.4
- provided
-
-
-
- org.springframework
- spring-jdbc
- ${spring-base-version}
-
-
- mysql
- mysql-connector-java
- 8.0.13
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.springframework
- spring-test
- ${spring-base-version}
- test
-
-
- com.oracle
- ojdbc6
- 11.2.0.3.0
-
-
-
- org.mybatis
- mybatis-spring
- 1.3.2
-
-
- org.mybatis
- mybatis
- 3.4.6
-
-
-
- com.alibaba
- druid
- 1.1.12
-
-
-
-
+ ${spring-base-version}
+
+
+ mysql
+ mysql-connector-java
+ 8.0.13
+
+
+ com.oracle
+ ojdbc6
+ 11.2.0.3.0
+
+
+
+ org.mybatis
+ mybatis-spring
+ 1.3.2
+
+
+ org.mybatis
+ mybatis
+ 3.4.6
+
+
+
+ com.alibaba
+ druid
+ 1.1.12
+
```
-#### 2、在web.xml 进行如下配置
+#### 2、在web.xml 中配置spring前端控制器、druid监控台servlet和filter
```xml
@@ -302,7 +238,7 @@ oracle.password=密码
```
-#### 5、新建mybtais 配置文件 更多settings配置项可以参考[官方文档](http://www.mybatis.org/mybatis-3/zh/configuration.html)
+#### 5、新建mybtais 配置文件,按需要进行额外配置,更多settings配置项可以参考[官方文档](http://www.mybatis.org/mybatis-3/zh/configuration.html)
```xml
diff --git a/spring/spring-druid-mybatis/src/main/resources/jdbc.properties b/spring/spring-druid-mybatis/src/main/resources/jdbc.properties
index e633488..525186b 100644
--- a/spring/spring-druid-mybatis/src/main/resources/jdbc.properties
+++ b/spring/spring-druid-mybatis/src/main/resources/jdbc.properties
@@ -1,5 +1,5 @@
# mysql ݿ
-mysql.url=jdbc:mysql://localhost:3306/mysql
+mysql.url=jdbc:mysql://localhost:3306/mysql?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
mysql.username=root
mysql.password=root
diff --git a/spring/spring-dubbo-annotation/README.md b/spring/spring-dubbo-annotation/README.md
index bf9d8fb..75b8e75 100644
--- a/spring/spring-dubbo-annotation/README.md
+++ b/spring/spring-dubbo-annotation/README.md
@@ -16,7 +16,7 @@
## 二、项目依赖
-**在父工程的项目中同一导入依赖dubbo依赖的的jar包**
+**在父工程的项目中统一导入依赖dubbo依赖的的jar包**
这里需要注意的是ZooKeeper 3.5.x 和 ZooKeeper 3.4.x 是存在不兼容的情况 详见官网解释[ZooKeeper Version Compatibility](https://curator.apache.org/zk-compatibility.html), zookeeper 3.5 目前是beta版本,所以zookeeper 我选择的版本是 zookeeper-3.4.9 作为服务端。但默认情况下 curator-framework自动引用的最新的3.5的版本客户端,会出现 KeeperException$UnimplementedException 异常
diff --git a/spring/spring-dubbo/README-副本.md b/spring/spring-dubbo/README-副本.md
deleted file mode 100644
index 085b046..0000000
--- a/spring/spring-dubbo/README-副本.md
+++ /dev/null
@@ -1,279 +0,0 @@
-# spring 整合 dubbo(xml配置方式)
-
-## 一、 项目结构说明
-
-1.1 按照dubbo 文档推荐的服务最佳实践,建议将服务接口、服务模型、服务异常等均放在 API 包中,所以项目采用maven多模块的构建方式,在spring-dubbo下构建三个子模块:
-
-1. dubbo-common 是公共模块,用于存放公共的接口和bean,被dubbo-provider和dubbo-provider在pom.xml中引用;
-2. dubbo-provider 是服务的提供者,提供商品的查询服务;
-3. dubbo-provider 是服务的消费者,调用provider提供的查询服务。
-
-1.2 本项目dubbo的搭建采用zookeeper作为注册中心, 关于zookeeper的安装和基本操作可以参见我的手记[Zookeeper 基础命令与Java客户端](https://github.com/heibaiying/LearningNotes/blob/master/notes/%E4%B8%AD%E9%97%B4%E4%BB%B6/ZooKeeper/ZooKeeper%E9%9B%86%E7%BE%A4%E6%90%AD%E5%BB%BA%E4%B8%8EJava%E5%AE%A2%E6%88%B7%E7%AB%AF.md)
-
-
-
-
-
-## 二、项目依赖
-
-**在父工程的项目中同一导入依赖dubbo依赖的的jar包**
-
-这里需要注意的是ZooKeeper 3.5.x 和 ZooKeeper 3.4.x 是存在不兼容的情况 详见官网解释[ZooKeeper Version Compatibility](https://curator.apache.org/zk-compatibility.html), zookeeper 3.5 目前是beta版本,所以zookeeper 我选择的版本是 zookeeper-3.4.9 作为服务端。但默认情况下 curator-framework自动引用的最新的3.5的版本客户端,会出现 KeeperException$UnimplementedException 异常
-
-```xml
-
-com.alibaba
-dubbo
-2.6.2
-
-
- org.apache.curator
- curator-framework
- 4.0.0
-
-
- org.apache.zookeeper
- zookeeper
-
-
-
-
- org.apache.zookeeper
- zookeeper
- 3.4.13
-
-```
-
-
-
-## 三、公共模块(dubbo-common)
-
-- api 下为公共的调用接口;
-- bean 下为公共的实体类。
-
-
-
-## 四、 服务提供者(dubbo-provider)
-
-
-
-#### 4.1 productService是服务的提供者( 商品数据用模拟数据展示)
-
-注:这里实现的接口IProductService来源于公共模块
-
-```java
-/**
- * @author : heibaiying
- * @description : 产品提供接口实现类
- */
-@Service
-public class ProductService implements IProductService {
-
- private static List productList = new ArrayList<>();
-
- static {
- for (int i = 0; i < 20; i++) {
- productList.add(new Product(i, "产品" + i, i / 2 == 0, new Date(), 66.66f * i));
- }
- }
-
- public Product queryProductById(int id) {
- for (Product product : productList) {
- if (product.getId() == id) {
- return product;
- }
- }
- return null;
- }
-
-
- public List queryAllProducts() {
- return productList;
- }
-}
-```
-
-#### 4.2 在dubbo.xml暴露服务
-
-```xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-```
-
-## 五、服务消费者(dubbo-consumer)
-
-
-
-#### 1.在dubbo.xml调用远程的服务
-
-```xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-```
-
-#### 2.消费服务
-
-```java
-@Controller
-@RequestMapping("sell")
-public class SellController {
-
- @Autowired
- private IProductService productService;
-
- @RequestMapping
- public String productList(Model model) {
- List products = productService.queryAllProducts();
- model.addAttribute("products", products);
- return "products";
- }
-
- @RequestMapping("product/{id}")
- public String productDetail(@PathVariable int id, Model model) {
- Product product = productService.queryProductById(id);
- model.addAttribute("product", product);
- return "product";
- }
-}
-```
-
-## 六、项目构建的说明
-
-因为在项目中,consumer和provider模块均依赖公共模块,所以在构建consumer和provider项目前需要将common 模块安装到本地仓库,**依次**对**父工程**和**common模块**执行:
-
-```shell
-mvn install -Dmaven.test.skip = true
-```
-
-consumer中 pom.xml如下
-
-```xml
-
-
-
- spring-dubbo
- com.heibaiying
- 1.0-SNAPSHOT
-
- 4.0.0
-
- dubbo-consumer
-
-
-
- com.heibaiying
- dubbo-common
- 1.0-SNAPSHOT
- compile
-
-
-
-
-```
-
-provider中 pom.xml如下
-
-```xml
-
-
-
- spring-dubbo
- com.heibaiying
- 1.0-SNAPSHOT
-
- 4.0.0
-
- dubbo-provider
-
-
-
- com.heibaiying
- dubbo-common
- 1.0-SNAPSHOT
- compile
-
-
-
-
-```
-
-## 七、关于dubbo新版本管理控制台的安装说明
-
-安装:
-
-```sh
-git clone https://github.com/apache/incubator-dubbo-ops.git /var/tmp/dubbo-ops
-cd /var/tmp/dubbo-ops
-mvn clean package
-```
-
-配置:
-
-```sh
-配置文件为:
-dubbo-admin-backend/src/main/resources/application.properties
-主要的配置有 默认的配置就是127.0.0.1:2181:
-dubbo.registry.address=zookeeper://127.0.0.1:2181
-```
-
-启动:
-
-```sh
-mvn --projects dubbo-admin-backend spring-boot:run
-```
-
-访问:
-
-```
-http://127.0.0.1:8080
-```
\ No newline at end of file
diff --git a/spring/spring-dubbo/README.md b/spring/spring-dubbo/README.md
index 52b799b..bc4bc80 100644
--- a/spring/spring-dubbo/README.md
+++ b/spring/spring-dubbo/README.md
@@ -16,7 +16,7 @@
## 二、项目依赖
-**在父工程的项目中同一导入依赖dubbo依赖的的jar包**
+**在父工程的项目中统一导入依赖dubbo依赖的的jar包**
这里需要注意的是ZooKeeper 3.5.x 和 ZooKeeper 3.4.x 是存在不兼容的情况 详见官网解释[ZooKeeper Version Compatibility](https://curator.apache.org/zk-compatibility.html), zookeeper 3.5 目前是beta版本,所以zookeeper 我选择的版本是 zookeeper-3.4.9 作为服务端。但默认情况下 curator-framework自动引用的最新的3.5的版本客户端,会出现 KeeperException$UnimplementedException 异常
diff --git a/spring/spring-jdbc-annotation/README.md b/spring/spring-jdbc-annotation/README.md
index e13afda..9bdfa08 100644
--- a/spring/spring-jdbc-annotation/README.md
+++ b/spring/spring-jdbc-annotation/README.md
@@ -1,114 +1,41 @@
-# spring 整合 jdbc template(注解配置方式)
+# spring 整合 jdbc template(注解方式)
-1、创建标准web maven工程,导入依赖
+## 1.说明
+
+#### 1.1 项目目录结构
+
+1. 数据源配置位于config目录下的DatabaseConfig.java和DataSourceConfig.java
+2. 项目以单元测试的方法进行测试
+
+
+
+
+
+#### 1.2 项目依赖
```xml
-
-
- 4.0.0
-
- com.heibaiying
+
+
+ org.springframework
spring-jdbc
- 1.0-SNAPSHOT
-
- 5.1.3.RELEASE
-
-
-
-
-
- org.springframework
- spring-context
- ${spring-base-version}
-
-
- org.springframework
- spring-beans
- ${spring-base-version}
-
-
- org.springframework
- spring-core
- ${spring-base-version}
-
-
- org.springframework
- spring-web
- ${spring-base-version}
-
-
- org.springframework
- spring-webmvc
- ${spring-base-version}
-
-
- javax.servlet
- javax.servlet-api
- 4.0.1
- provided
-
-
- org.projectlombok
- lombok
- 1.18.4
- provided
-
-
-
- org.springframework
- spring-jdbc
- ${spring-base-version}
-
-
- mysql
- mysql-connector-java
- 8.0.13
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.springframework
- spring-test
- ${spring-base-version}
- test
-
-
- com.oracle
- ojdbc6
- 11.2.0.3.0
-
-
-
-
+ ${spring-base-version}
+
+
+ mysql
+ mysql-connector-java
+ 8.0.13
+
+
+ com.oracle
+ ojdbc6
+ 11.2.0.3.0
+
+
```
-2、新建 DispatcherServletInitializer.java继承自AbstractAnnotationConfigDispatcherServletInitializer,等价于我们在web.xml中配置的前端控制器
+## 二、spring 整合 jdbc template
-```java
-public class DispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-
- protected Class>[] getRootConfigClasses() {
- return new Class[0];
- }
-
- protected Class>[] getServletConfigClasses() {
- return new Class[]{ServletConfig.class};
- }
-
- protected String[] getServletMappings() {
- return new String[]{"/"};
- }
-}
-```
-
-3、在resources文件夹下新建数据库配置文件mysql.properties、oracle.properties
+#### 2.1 在resources文件夹下新建数据库配置文件mysql.properties、oracle.properties及其映射类
```properties
# mysql 数据库配置
@@ -126,21 +53,7 @@ oracle.username=用户名
oracle.password=密码
```
-4、在新建数据库配置映射类DataSourceConfig.java
-
```java
-package com.heibaiying.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@Configuration
@PropertySource(value = "classpath:mysql.properties")
@Data
@@ -159,27 +72,13 @@ public class DataSourceConfig {
```
-5、新建ServletConfig.java,进行数据库相关配置
+#### 2.2 新建数据库配置类DatabaseConfig.java
```java
-package com.heibaiying.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @author : heibaiying
- */
@Configuration
@EnableTransactionManagement // 开启声明式事务处理 等价于xml中
@ComponentScan(basePackages = {"com.heibaiying.*"})
-public class ServletConfig implements WebMvcConfigurer {
+public class DatabaseConfig {
/**
* 配置数据源
@@ -194,6 +93,7 @@ public class ServletConfig implements WebMvcConfigurer {
return dataSource;
}
+
/**
* 配置jdbcTemplate
* @param dataSource 这个参数的名称需要保持和上面方法名一致 才能自动注入,因为
@@ -217,36 +117,12 @@ public class ServletConfig implements WebMvcConfigurer {
}
}
+
```
-6、新建查询接口及其实现类,这里我查询的表是mysql和oracle中的字典表
+#### 2.3 新建查询接口及其实现类,这里我查询的表是mysql和oracle中的字典表
```java
-public interface MysqlDao {
-
- List get();
-}
-```
-
-```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Relation;
-import com.heibaiying.dao.impl.MysqlDao;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@Repository
public class MysqlDaoImpl implements MysqlDao {
@@ -274,42 +150,9 @@ public class MysqlDaoImpl implements MysqlDao {
```
-```mysql
-package com.heibaiying.dao.impl;
-import com.heibaiying.bean.Flow;
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-public interface OracleDao {
-
- List get();
-}
-
-```
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Flow;
-import com.heibaiying.dao.impl.OracleDao;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@Repository
public class OracleDaoImpl implements OracleDao {
@@ -338,30 +181,11 @@ public class OracleDaoImpl implements OracleDao {
```
-7、新建测试类进行测试
+#### 2.4 新建测试类进行测试
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Relation;
-import com.heibaiying.config.DispatcherServletInitializer;
-import com.heibaiying.config.ServletConfig;
-import com.heibaiying.dao.impl.MysqlDao;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {DispatcherServletInitializer.class, ServletConfig.class})
+@ContextConfiguration(classes = {ServletConfig.class})
public class MysqlDaoTest {
@Autowired
@@ -380,28 +204,8 @@ public class MysqlDaoTest {
```
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Flow;
-import com.heibaiying.config.DispatcherServletInitializer;
-import com.heibaiying.config.ServletConfig;
-import com.heibaiying.dao.impl.OracleDao;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {DispatcherServletInitializer.class, ServletConfig.class})
+@ContextConfiguration(classes = {ServletConfig.class})
public class OracleDaoTest {
/*注入接口时: 如果接口有多个实现类 可以用这个指定具体的实现类*/
diff --git a/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java b/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java
index 51dd508..295ae2d 100644
--- a/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java
+++ b/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java
@@ -7,7 +7,6 @@ import org.springframework.context.annotation.PropertySource;
/**
* @author : heibaiying
- * @description :
*/
@Configuration
@@ -15,10 +14,6 @@ import org.springframework.context.annotation.PropertySource;
@Data
public class DataSourceConfig {
- /**
- * 感觉这种注入的方式并不够好
- * 没有spring-boot中使用@ConfigurationProperties(prefix = "config")指定前缀注入的方式优雅
- */
@Value("${mysql.driverClassName}")
private String driverClassName;
@Value("${mysql.url}")
diff --git a/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/ServletConfig.java b/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DatabaseConfig.java
similarity index 93%
rename from spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/ServletConfig.java
rename to spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DatabaseConfig.java
index 43face4..c6a3105 100644
--- a/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/ServletConfig.java
+++ b/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DatabaseConfig.java
@@ -7,7 +7,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* @author : heibaiying
@@ -15,7 +14,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
@EnableTransactionManagement // 开启声明式事务处理 等价于xml中
@ComponentScan(basePackages = {"com.heibaiying.*"})
-public class ServletConfig implements WebMvcConfigurer {
+public class DatabaseConfig {
/**
* 配置数据源
diff --git a/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DispatcherServletInitializer.java b/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DispatcherServletInitializer.java
deleted file mode 100644
index 7ed14d2..0000000
--- a/spring/spring-jdbc-annotation/src/main/java/com/heibaiying/config/DispatcherServletInitializer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.heibaiying.config;
-
-import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
-
-/**
- * @author : heibaiying
- */
-
-public class DispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-
- protected Class>[] getRootConfigClasses() {
- return new Class[0];
- }
-
- protected Class>[] getServletConfigClasses() {
- return new Class[]{ServletConfig.class};
- }
-
- protected String[] getServletMappings() {
- return new String[]{"/"};
- }
-}
diff --git a/spring/spring-jdbc-annotation/src/main/resources/mysql.properties b/spring/spring-jdbc-annotation/src/main/resources/mysql.properties
index e8ab06b..27b2bdc 100644
--- a/spring/spring-jdbc-annotation/src/main/resources/mysql.properties
+++ b/spring/spring-jdbc-annotation/src/main/resources/mysql.properties
@@ -1,5 +1,5 @@
# mysql ݿ
-mysql.driverClassName=com.mysql.jdbc.Driver
-mysql.url=jdbc:mysql://localhost:3306/mysql
+mysql.driverClassName=com.mysql.cj.jdbc.Driver
+mysql.url=jdbc:mysql://localhost:3306/mysql?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
mysql.username=root
mysql.password=root
diff --git a/spring/spring-jdbc-annotation/src/test/java/com/heibaiying/dao/MysqlDaoTest.java b/spring/spring-jdbc-annotation/src/test/java/com/heibaiying/dao/MysqlDaoTest.java
index ef3b774..0423637 100644
--- a/spring/spring-jdbc-annotation/src/test/java/com/heibaiying/dao/MysqlDaoTest.java
+++ b/spring/spring-jdbc-annotation/src/test/java/com/heibaiying/dao/MysqlDaoTest.java
@@ -1,8 +1,7 @@
package com.heibaiying.dao;
import com.heibaiying.bean.Relation;
-import com.heibaiying.config.DispatcherServletInitializer;
-import com.heibaiying.config.ServletConfig;
+import com.heibaiying.config.DatabaseConfig;
import com.heibaiying.dao.impl.MysqlDao;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -18,7 +17,7 @@ import java.util.List;
*/
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {DispatcherServletInitializer.class, ServletConfig.class})
+@ContextConfiguration(classes = {DatabaseConfig.class})
public class MysqlDaoTest {
@Autowired
diff --git a/spring/spring-jdbc-annotation/src/test/java/com/heibaiying/dao/OracleDaoTest.java b/spring/spring-jdbc-annotation/src/test/java/com/heibaiying/dao/OracleDaoTest.java
index a4cd513..8d6cc4d 100644
--- a/spring/spring-jdbc-annotation/src/test/java/com/heibaiying/dao/OracleDaoTest.java
+++ b/spring/spring-jdbc-annotation/src/test/java/com/heibaiying/dao/OracleDaoTest.java
@@ -1,8 +1,7 @@
package com.heibaiying.dao;
import com.heibaiying.bean.Flow;
-import com.heibaiying.config.DispatcherServletInitializer;
-import com.heibaiying.config.ServletConfig;
+import com.heibaiying.config.DatabaseConfig;
import com.heibaiying.dao.impl.OracleDao;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -19,7 +18,7 @@ import java.util.List;
*/
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {DispatcherServletInitializer.class, ServletConfig.class})
+@ContextConfiguration(classes = {DatabaseConfig.class})
public class OracleDaoTest {
/*注入接口时: 如果接口有多个实现类 可以用这个指定具体的实现类*/
diff --git a/spring/spring-jdbc/README.md b/spring/spring-jdbc/README.md
index 9d92447..e2e1498 100644
--- a/spring/spring-jdbc/README.md
+++ b/spring/spring-jdbc/README.md
@@ -1,124 +1,38 @@
# spring 整合 jdbc template(xml配置方式)
-1、创建标准web maven工程,导入依赖
+## 一、说明
+
+#### 1.1 项目结构
+
+
+
+#### 1.2 项目依赖
```xml
-
-
- 4.0.0
-
- com.heibaiying
+
+
+ org.springframework
spring-jdbc
- 1.0-SNAPSHOT
-
- 5.1.3.RELEASE
-
-
-
-
-
- org.springframework
- spring-context
- ${spring-base-version}
-
-
- org.springframework
- spring-beans
- ${spring-base-version}
-
-
- org.springframework
- spring-core
- ${spring-base-version}
-
-
- org.springframework
- spring-web
- ${spring-base-version}
-
-
- org.springframework
- spring-webmvc
- ${spring-base-version}
-
-
- javax.servlet
- javax.servlet-api
- 4.0.1
- provided
-
-
- org.projectlombok
- lombok
- 1.18.4
- provided
-
-
-
- org.springframework
- spring-jdbc
- ${spring-base-version}
-
-
- mysql
- mysql-connector-java
- 8.0.13
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.springframework
- spring-test
- ${spring-base-version}
- test
-
-
- com.oracle
- ojdbc6
- 11.2.0.3.0
-
-
-
-
+ ${spring-base-version}
+
+
+ mysql
+ mysql-connector-java
+ 8.0.13
+
+
+ com.oracle
+ ojdbc6
+ 11.2.0.3.0
+
+
```
-2、在web.xml 进行如下配置
-```xml
-
-
-
-
- springMvc
- org.springframework.web.servlet.DispatcherServlet
-
- contextConfigLocation
- classpath:springApplication.xml
-
- 1
-
+## 二、 spring 整合 jdbc template
-
- springMvc
- /
-
-
-
-```
-
-3、在resources文件夹下新建数据库配置文件jdbc.properties
+#### 1、在resources文件夹下新建数据库配置文件jdbc.properties
```properties
# mysql 数据库配置
@@ -134,7 +48,7 @@ oracle.username=用户名
oracle.password=密码
```
-4、在resources文件夹下创建springApplication.xml 配置文件
+#### 2、配置Jdbc数据源并定义事务管理器
```xml
@@ -182,34 +96,9 @@ oracle.password=密码
```
-5、新建查询接口及其实现类,这里我查询的表是mysql和oracle中的字典表
+#### 3、新建查询接口及其实现类,这里我查询的表是mysql和oracle中的字典表
```java
-public interface MysqlDao {
-
- List get();
-}
-```
-
-```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Relation;
-import com.heibaiying.dao.impl.MysqlDao;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@Repository
public class MysqlDaoImpl implements MysqlDao {
@@ -237,42 +126,7 @@ public class MysqlDaoImpl implements MysqlDao {
```
-```mysql
-package com.heibaiying.dao.impl;
-
-import com.heibaiying.bean.Flow;
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-public interface OracleDao {
-
- List get();
-}
-
-```
-
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Flow;
-import com.heibaiying.dao.impl.OracleDao;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@Repository
public class OracleDaoImpl implements OracleDao {
@@ -298,29 +152,11 @@ public class OracleDaoImpl implements OracleDao {
return flows;
}
}
-
```
-6.新建测试类进行测试
+#### 4.新建测试类进行测试
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Relation;
-import com.heibaiying.dao.impl.MysqlDao;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RunWith(SpringRunner.class)
@ContextConfiguration({"classpath:springApplication.xml"})
public class MysqlDaoTest {
@@ -342,24 +178,6 @@ public class MysqlDaoTest {
```
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Flow;
-import com.heibaiying.dao.impl.OracleDao;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RunWith(SpringRunner.class)
@ContextConfiguration({"classpath:springApplication.xml"})
public class OracleDaoTest {
diff --git a/spring/spring-jdbc/src/main/resources/jdbc.properties b/spring/spring-jdbc/src/main/resources/jdbc.properties
index 6dadcd3..fb89a05 100644
--- a/spring/spring-jdbc/src/main/resources/jdbc.properties
+++ b/spring/spring-jdbc/src/main/resources/jdbc.properties
@@ -1,6 +1,6 @@
# mysql ݿ
-mysql.driverClassName=com.mysql.jdbc.Driver
-mysql.url=jdbc:mysql://localhost:3306/mysql
+mysql.driverClassName=com.mysql.cj.jdbc.Driver
+mysql.url=jdbc:mysql://localhost:3306/mysql?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
mysql.username=root
mysql.password=root
diff --git a/spring/spring-mybatis-annotation/README.md b/spring/spring-mybatis-annotation/README.md
index af6d0fc..bac6696 100644
--- a/spring/spring-mybatis-annotation/README.md
+++ b/spring/spring-mybatis-annotation/README.md
@@ -1,125 +1,48 @@
-# spring 整合 mybatis(注解配置方式)
+# spring 整合 mybatis(xml配置方式)
-1、创建标准web maven工程,导入依赖
+## 一、说明
+
+#### 1.1 项目结构
+
+
+
+#### 1.2 项目依赖
+
+除了spring相关依赖外,还需要导入数据库驱动和对应的mybatis依赖包
```xml
-
-
- 4.0.0
-
- com.heibaiying
+
+
+ org.springframework
spring-jdbc
- 1.0-SNAPSHOT
-
- 5.1.3.RELEASE
-
-
-
-
-
- org.springframework
- spring-context
- ${spring-base-version}
-
-
- org.springframework
- spring-beans
- ${spring-base-version}
-
-
- org.springframework
- spring-core
- ${spring-base-version}
-
-
- org.springframework
- spring-web
- ${spring-base-version}
-
-
- org.springframework
- spring-webmvc
- ${spring-base-version}
-
-
- javax.servlet
- javax.servlet-api
- 4.0.1
- provided
-
-
- org.projectlombok
- lombok
- 1.18.4
- provided
-
-
-
- org.springframework
- spring-jdbc
- ${spring-base-version}
-
-
- mysql
- mysql-connector-java
- 8.0.13
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.springframework
- spring-test
- ${spring-base-version}
- test
-
-
- com.oracle
- ojdbc6
- 11.2.0.3.0
-
-
-
- org.mybatis
- mybatis-spring
- 1.3.2
-
-
- org.mybatis
- mybatis
- 3.4.6
-
-
-
-
+ ${spring-base-version}
+
+
+ mysql
+ mysql-connector-java
+ 8.0.13
+
+
+ com.oracle
+ ojdbc6
+ 11.2.0.3.0
+
+
+
+ org.mybatis
+ mybatis-spring
+ 1.3.2
+
+
+ org.mybatis
+ mybatis
+ 3.4.6
+
```
-2、新建 DispatcherServletInitializer.java继承自AbstractAnnotationConfigDispatcherServletInitializer,等价于我们在web.xml中配置的前端控制器
+## 二、spring 整合 mybatis
-```java
-public class DispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-
- protected Class>[] getRootConfigClasses() {
- return new Class[0];
- }
-
- protected Class>[] getServletConfigClasses() {
- return new Class[]{ServletConfig.class};
- }
-
- protected String[] getServletMappings() {
- return new String[]{"/"};
- }
-}
-```
-
-3、在resources文件夹下新建数据库配置文件mysql.properties、oracle.properties
+#### 2.1 在resources文件夹下新建数据库配置文件jdbc.properties及其映射类
```properties
# mysql 数据库配置
@@ -127,9 +50,7 @@ mysql.driverClassName=com.mysql.jdbc.Driver
mysql.url=jdbc:mysql://localhost:3306/mysql
mysql.username=root
mysql.password=root
-```
-```properties
# oracle 数据库配置
oracle.driverClassName=oracle.jdbc.driver.OracleDriver
oracle.url=jdbc:oracle:thin:@//IP地址:端口号/数据库实例名
@@ -137,21 +58,7 @@ oracle.username=用户名
oracle.password=密码
```
-4、在新建数据库配置映射类DataSourceConfig.java
-
```java
-package com.heibaiying.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@Configuration
@PropertySource(value = "classpath:mysql.properties")
@Data
@@ -167,35 +74,18 @@ public class DataSourceConfig {
private String password;
}
-
```
-5、新建ServletConfig.java,进行数据库相关配置
+#### 2.2 配置数据源和mybatis会话工厂、定义事务管理器
```java
-package com.heibaiying.config;
-
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.io.IOException;
-
-
/**
* @author : heibaiying
*/
@Configuration
@EnableTransactionManagement // 开启声明式事务处理 等价于xml中
@ComponentScan(basePackages = {"com.heibaiying.*"})
-public class ServletConfig implements WebMvcConfigurer {
+public class DatabaseConfig {
/* @Autowired
* private DataSourceConfig sourceConfig;
@@ -216,7 +106,6 @@ public class ServletConfig implements WebMvcConfigurer {
return dataSource;
}
-
/**
* 配置mybatis 会话工厂
*
@@ -258,7 +147,7 @@ public class ServletConfig implements WebMvcConfigurer {
```
-5、新建mybtais 配置文件 更多settings配置项可以参考[官方文档](http://www.mybatis.org/mybatis-3/zh/configuration.html)
+#### 2.3 新建mybtais配置文件,按照需求配置额外参数, 更多settings配置项可以参考[官方文档](http://www.mybatis.org/mybatis-3/zh/configuration.html)
```xml
@@ -281,7 +170,7 @@ public class ServletConfig implements WebMvcConfigurer {
```
-5、新建查询接口及其对应的mapper文件
+#### 2.4 新建查询接口及其对应的mapper文件
```java
public interface MysqlDao {
@@ -328,30 +217,11 @@ public interface OracleDao {
```
-6.新建测试类进行测试
+#### 2.5 新建测试类进行测试
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Relation;
-import com.heibaiying.config.DataSourceConfig;
-import com.heibaiying.config.DispatcherServletInitializer;
-import com.heibaiying.config.ServletConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {DispatcherServletInitializer.class, ServletConfig.class})
+@ContextConfiguration(classes = {DatabaseConfig.class})
public class MysqlDaoTest {
@Autowired
@@ -370,27 +240,8 @@ public class MysqlDaoTest {
```
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Flow;
-import com.heibaiying.config.DataSourceConfig;
-import com.heibaiying.config.DispatcherServletInitializer;
-import com.heibaiying.config.ServletConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {DispatcherServletInitializer.class, ServletConfig.class})
+@ContextConfiguration(classes = {DatabaseConfig.class})
public class OracleDaoTest {
@Autowired
@@ -406,5 +257,6 @@ public class OracleDaoTest {
}
}
}
+
```
diff --git a/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java b/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java
index 51dd508..295ae2d 100644
--- a/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java
+++ b/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DataSourceConfig.java
@@ -7,7 +7,6 @@ import org.springframework.context.annotation.PropertySource;
/**
* @author : heibaiying
- * @description :
*/
@Configuration
@@ -15,10 +14,6 @@ import org.springframework.context.annotation.PropertySource;
@Data
public class DataSourceConfig {
- /**
- * 感觉这种注入的方式并不够好
- * 没有spring-boot中使用@ConfigurationProperties(prefix = "config")指定前缀注入的方式优雅
- */
@Value("${mysql.driverClassName}")
private String driverClassName;
@Value("${mysql.url}")
diff --git a/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/ServletConfig.java b/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DatabaseConfig.java
similarity index 98%
rename from spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/ServletConfig.java
rename to spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DatabaseConfig.java
index 33d9bec..85a5dde 100644
--- a/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/ServletConfig.java
+++ b/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DatabaseConfig.java
@@ -20,7 +20,7 @@ import java.io.IOException;
@Configuration
@EnableTransactionManagement // 开启声明式事务处理 等价于xml中
@ComponentScan(basePackages = {"com.heibaiying.*"})
-public class ServletConfig implements WebMvcConfigurer {
+public class DatabaseConfig {
/* @Autowired
* private DataSourceConfig sourceConfig;
diff --git a/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DispatcherServletInitializer.java b/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DispatcherServletInitializer.java
deleted file mode 100644
index 7ed14d2..0000000
--- a/spring/spring-mybatis-annotation/src/main/java/com/heibaiying/config/DispatcherServletInitializer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.heibaiying.config;
-
-import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
-
-/**
- * @author : heibaiying
- */
-
-public class DispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-
- protected Class>[] getRootConfigClasses() {
- return new Class[0];
- }
-
- protected Class>[] getServletConfigClasses() {
- return new Class[]{ServletConfig.class};
- }
-
- protected String[] getServletMappings() {
- return new String[]{"/"};
- }
-}
diff --git a/spring/spring-mybatis-annotation/src/main/resources/mysql.properties b/spring/spring-mybatis-annotation/src/main/resources/mysql.properties
index e8ab06b..27b2bdc 100644
--- a/spring/spring-mybatis-annotation/src/main/resources/mysql.properties
+++ b/spring/spring-mybatis-annotation/src/main/resources/mysql.properties
@@ -1,5 +1,5 @@
# mysql ݿ
-mysql.driverClassName=com.mysql.jdbc.Driver
-mysql.url=jdbc:mysql://localhost:3306/mysql
+mysql.driverClassName=com.mysql.cj.jdbc.Driver
+mysql.url=jdbc:mysql://localhost:3306/mysql?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
mysql.username=root
mysql.password=root
diff --git a/spring/spring-mybatis-annotation/src/test/java/com/heibaiying/dao/MysqlDaoTest.java b/spring/spring-mybatis-annotation/src/test/java/com/heibaiying/dao/MysqlDaoTest.java
index 99dc047..30d5d9a 100644
--- a/spring/spring-mybatis-annotation/src/test/java/com/heibaiying/dao/MysqlDaoTest.java
+++ b/spring/spring-mybatis-annotation/src/test/java/com/heibaiying/dao/MysqlDaoTest.java
@@ -1,9 +1,7 @@
package com.heibaiying.dao;
import com.heibaiying.bean.Relation;
-import com.heibaiying.config.DataSourceConfig;
-import com.heibaiying.config.DispatcherServletInitializer;
-import com.heibaiying.config.ServletConfig;
+import com.heibaiying.config.DatabaseConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +16,7 @@ import java.util.List;
*/
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {DispatcherServletInitializer.class, ServletConfig.class})
+@ContextConfiguration(classes = {DatabaseConfig.class})
public class MysqlDaoTest {
@Autowired
diff --git a/spring/spring-mybatis-annotation/src/test/java/com/heibaiying/dao/OracleDaoTest.java b/spring/spring-mybatis-annotation/src/test/java/com/heibaiying/dao/OracleDaoTest.java
index 38a03d6..f5e9350 100644
--- a/spring/spring-mybatis-annotation/src/test/java/com/heibaiying/dao/OracleDaoTest.java
+++ b/spring/spring-mybatis-annotation/src/test/java/com/heibaiying/dao/OracleDaoTest.java
@@ -1,9 +1,7 @@
package com.heibaiying.dao;
import com.heibaiying.bean.Flow;
-import com.heibaiying.config.DataSourceConfig;
-import com.heibaiying.config.DispatcherServletInitializer;
-import com.heibaiying.config.ServletConfig;
+import com.heibaiying.config.DatabaseConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +16,7 @@ import java.util.List;
*/
@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {DispatcherServletInitializer.class, ServletConfig.class})
+@ContextConfiguration(classes = {DatabaseConfig.class})
public class OracleDaoTest {
@Autowired
diff --git a/spring/spring-mybatis/README.md b/spring/spring-mybatis/README.md
index 492f2f2..7607c5c 100644
--- a/spring/spring-mybatis/README.md
+++ b/spring/spring-mybatis/README.md
@@ -1,135 +1,48 @@
# spring 整合 mybatis(xml配置方式)
-1、创建标准web maven工程,导入依赖
+## 一、说明
+
+#### 1.1 项目结构
+
+
+
+#### 1.2 项目依赖
+
+除了spring相关依赖外,还需要导入数据库驱动和对应的mybatis依赖包
```xml
-
-
- 4.0.0
-
- com.heibaiying
+
+
+ org.springframework
spring-jdbc
- 1.0-SNAPSHOT
-
- 5.1.3.RELEASE
-
-
-
-
-
- org.springframework
- spring-context
- ${spring-base-version}
-
-
- org.springframework
- spring-beans
- ${spring-base-version}
-
-
- org.springframework
- spring-core
- ${spring-base-version}
-
-
- org.springframework
- spring-web
- ${spring-base-version}
-
-
- org.springframework
- spring-webmvc
- ${spring-base-version}
-
-
- javax.servlet
- javax.servlet-api
- 4.0.1
- provided
-
-
- org.projectlombok
- lombok
- 1.18.4
- provided
-
-
-
- org.springframework
- spring-jdbc
- ${spring-base-version}
-
-
- mysql
- mysql-connector-java
- 8.0.13
-
-
-
- junit
- junit
- 4.12
- test
-
-
- org.springframework
- spring-test
- ${spring-base-version}
- test
-
-
- com.oracle
- ojdbc6
- 11.2.0.3.0
-
-
-
- org.mybatis
- mybatis-spring
- 1.3.2
-
-
- org.mybatis
- mybatis
- 3.4.6
-
-
-
-
+ ${spring-base-version}
+
+
+ mysql
+ mysql-connector-java
+ 8.0.13
+
+
+ com.oracle
+ ojdbc6
+ 11.2.0.3.0
+
+
+
+ org.mybatis
+ mybatis-spring
+ 1.3.2
+
+
+ org.mybatis
+ mybatis
+ 3.4.6
+
```
-2、在web.xml 进行如下配置
+## 二、spring 整合 mybatis
-```xml
-
-
-
-
-
- springMvc
- org.springframework.web.servlet.DispatcherServlet
-
- contextConfigLocation
- classpath:springApplication.xml
-
- 1
-
-
-
- springMvc
- /
-
-
-
-```
-
-3、在resources文件夹下新建数据库配置文件jdbc.properties
+#### 2.1 在resources文件夹下新建数据库配置文件jdbc.properties
```properties
# mysql 数据库配置
@@ -145,7 +58,7 @@ oracle.username=用户名
oracle.password=密码
```
-4、在resources文件夹下创建springApplication.xml 配置文件
+#### 2.2 配置数据源和mybatis会话工厂、定义事务管理器
```xml
@@ -205,7 +118,7 @@ oracle.password=密码
```
-5、新建mybtais 配置文件 更多settings配置项可以参考[官方文档](http://www.mybatis.org/mybatis-3/zh/configuration.html)
+#### 2.3 新建mybtais配置文件,按照需求配置额外参数, 更多settings配置项可以参考[官方文档](http://www.mybatis.org/mybatis-3/zh/configuration.html)
```xml
@@ -228,7 +141,7 @@ oracle.password=密码
```
-5、新建查询接口及其对应的mapper文件
+#### 2.4 新建查询接口及其对应的mapper文件
```java
public interface MysqlDao {
@@ -275,26 +188,9 @@ public interface OracleDao {
```
-6.新建测试类进行测试
+#### 2.5 新建测试类进行测试
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Relation;
-import com.heibaiying.dao.impl.MysqlDao;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RunWith(SpringRunner.class)
@ContextConfiguration({"classpath:springApplication.xml"})
public class MysqlDaoTest {
@@ -316,24 +212,6 @@ public class MysqlDaoTest {
```
```java
-package com.heibaiying.dao;
-
-import com.heibaiying.bean.Flow;
-import com.heibaiying.dao.impl.OracleDao;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-/**
- * @author : heibaiying
- * @description :
- */
-
@RunWith(SpringRunner.class)
@ContextConfiguration({"classpath:springApplication.xml"})
public class OracleDaoTest {
diff --git a/spring/spring-mybatis/src/main/resources/jdbc.properties b/spring/spring-mybatis/src/main/resources/jdbc.properties
index 6dadcd3..fb89a05 100644
--- a/spring/spring-mybatis/src/main/resources/jdbc.properties
+++ b/spring/spring-mybatis/src/main/resources/jdbc.properties
@@ -1,6 +1,6 @@
# mysql ݿ
-mysql.driverClassName=com.mysql.jdbc.Driver
-mysql.url=jdbc:mysql://localhost:3306/mysql
+mysql.driverClassName=com.mysql.cj.jdbc.Driver
+mysql.url=jdbc:mysql://localhost:3306/mysql?characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
mysql.username=root
mysql.password=root