From 85663b9387f1a58254c31a0db31dd3e37e58db04 Mon Sep 17 00:00:00 2001
From: fanxb <fanxb.tl@gmail.com>
Date: Sat, 23 Feb 2019 20:44:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                   | 6 ------
 java/spring/1.spring基础.md                                 | 2 +-
 java/spring/2.最小化XML配置.md                              | 2 +-
 java/spring/3.面向切面的Spring.md                           | 2 +-
 java/springboot系列/springboot搭建/springboot搭建.md        | 2 +-
 .../springsecurity/springboot+security整合1.md              | 2 +-
 .../springsecurity/springboot+security整合2.md              | 2 +-
 .../springsecurity/springboot+security整合3.md              | 2 +-
 java/springboot系列/websocket/springboot整合websocket.md    | 2 +-
 .../数据库/springboot整合mybatis(xml和注解).md              | 2 +-
 java/springboot系列/数据库/springboot整合redis.md           | 5 +++--
 java/springboot系列/消息队列/springboot整合activeMQ（1）.md | 2 +-
 java/springboot系列/消息队列/springboot整合activeMQ（2）.md | 2 +-
 java/springboot系列/读写分离配置/springboot配置读写分离.md  | 2 +-
 java/springcloud实战/1.springCloudConfig使用.md             | 2 +-
 java/springcloud实战/2.springCloud服务发现.md               | 2 +-
 .../3.springCloud与Netflix Hystrix的弹性客户端模式.md       | 2 +-
 java/springcloud实战/4.springCloud之Zuul服务路由.md         | 2 +-
 .../5.springCloud之Spring Cloud Stream事件驱动架构.md       | 2 +-
 java/其他/Java线程池问题.md                                 | 2 +-
 java/其他/java导出EXCEL文件.md                              | 2 +-
 linux/docker/1.linux下docker安装与配置.md                   | 2 +-
 linux/docker/2.docker简单使用教程.md                        | 2 +-
 linux/docker/3.docker部署java应用.md                        | 2 +-
 linux/软件安装/docker下mysql启动报错.md                     | 2 +-
 linux/软件安装/linux下mongodb的安装与配置(非atp).md         | 2 +-
 node/环境配置/vscode开发调试typescript.md                   | 2 +-
 node/项目/node,vue开发教学管理系统.md                       | 2 +-
 其他各种/git crlf、lf自动转换引起的问题.md                  | 2 +-
 其他各种/正则表达式在密码匹配中的使用.md                    | 2 +-
 数据库/分布式/分布式事务.md                                 | 2 +-
 数据库/分布式/数据库事务四个特性及隔离级别.md               | 2 +-
 数据库/基础/1.mysql使用查询结果进行插入操作.md              | 2 +-
 .../Q807 保持城市天际线(Max Increase to Keep City Skyline).md | 2 +-
 网络/nat模式虚拟机主机相互ping通.md                         | 2 +-
 35 files changed, 36 insertions(+), 41 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index 3787814..0000000
--- a/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: false
----
-# technology-note
-记录技术笔记
-
diff --git a/java/spring/1.spring基础.md b/java/spring/1.spring基础.md
index 1f74671..d86c3a5 100644
--- a/java/spring/1.spring基础.md
+++ b/java/spring/1.spring基础.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-10-20-10-38-05"
-date: "2018-10-20-10-38-05"
+date: "2018/10/20 10:38:05"
 title: "spring基础"
 tags: ["java", "spring"]
 categories: 
diff --git a/java/spring/2.最小化XML配置.md b/java/spring/2.最小化XML配置.md
index 8182a37..b8db085 100644
--- a/java/spring/2.最小化XML配置.md
+++ b/java/spring/2.最小化XML配置.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-10-21-10-38-05"
-date: "2018-10-21-10-38-05"
+date: "2018/10/21 10:38:05"
 title: "spring之最小化XML配置"
 tags: ["java", "spring"]
 categories: 
diff --git a/java/spring/3.面向切面的Spring.md b/java/spring/3.面向切面的Spring.md
index 0f13bd5..48029ed 100644
--- a/java/spring/3.面向切面的Spring.md
+++ b/java/spring/3.面向切面的Spring.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-10-22-10-38-05"
-date: "2018-10-22-10-38-05"
+date: "2018/10/22 10:38:05"
 title: "spring之面向切面"
 tags: ["java", "spring"]
 categories: 
diff --git a/java/springboot系列/springboot搭建/springboot搭建.md b/java/springboot系列/springboot搭建/springboot搭建.md
index 221b204..8767206 100644
--- a/java/springboot系列/springboot搭建/springboot搭建.md
+++ b/java/springboot系列/springboot搭建/springboot搭建.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-08-13-10-38"
-date: "2018-08-13-10-38"
+date: "2018/08/13 10:38:00"
 title: "springboot搭建"
 tags: ["java", "spring","springboot","idea"]
 categories: 
diff --git a/java/springboot系列/springsecurity/springboot+security整合1.md b/java/springboot系列/springsecurity/springboot+security整合1.md
index b09a08c..18a37dd 100644
--- a/java/springboot系列/springsecurity/springboot+security整合1.md
+++ b/java/springboot系列/springsecurity/springboot+security整合1.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-08-20-10-38"
-date: "2018-08-20-10-38"
+date: "2018/08/20 10:38:00"
 title: "springboot+security整合（1）"
 tags: ["java", "spring","springboot","spring-security","security"]
 categories: 
diff --git a/java/springboot系列/springsecurity/springboot+security整合2.md b/java/springboot系列/springsecurity/springboot+security整合2.md
index 1d5913d..a51b5bd 100644
--- a/java/springboot系列/springsecurity/springboot+security整合2.md
+++ b/java/springboot系列/springsecurity/springboot+security整合2.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-08-21-10-38"
-date: "2018-08-21-10-38"
+date: "2018/08/21 10:38"
 title: "springboot+security整合（2）"
 tags: ["java", "spring","springboot","spring-security","security"]
 categories: 
diff --git a/java/springboot系列/springsecurity/springboot+security整合3.md b/java/springboot系列/springsecurity/springboot+security整合3.md
index 11f41a7..b22a867 100644
--- a/java/springboot系列/springsecurity/springboot+security整合3.md
+++ b/java/springboot系列/springsecurity/springboot+security整合3.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-08-22-10-38"
-date: "2018-08-22-10-38"
+date: "2018/08/22 10:38:00"
 title: "springboot+security整合（3）"
 tags: ["java", "spring", "springboot", "spring-security", "security"]
 categories:
diff --git a/java/springboot系列/websocket/springboot整合websocket.md b/java/springboot系列/websocket/springboot整合websocket.md
index 0b001ef..7d77f04 100644
--- a/java/springboot系列/websocket/springboot整合websocket.md
+++ b/java/springboot系列/websocket/springboot整合websocket.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-08-25-10-38"
-date: "2018-08-25-10-38"
+date: "2018/08/25 10:38:00"
 title: "springboot整合WebSocket"
 tags: ["java", "spring","springboot","WebSocket"]
 categories: 
diff --git a/java/springboot系列/数据库/springboot整合mybatis(xml和注解).md b/java/springboot系列/数据库/springboot整合mybatis(xml和注解).md
index e9a36c0..20ce85f 100644
--- a/java/springboot系列/数据库/springboot整合mybatis(xml和注解).md
+++ b/java/springboot系列/数据库/springboot整合mybatis(xml和注解).md
@@ -1,6 +1,6 @@
 ---
 id: "2018-09-01-10-38"
-date: "2018-09-01-10-38"
+date: "2018/09/01 10:38:00"
 title: "springboot整合Mybatis(xml和注解)"
 tag: ["java", "spring","springboot","mysql","mybatis","xml","注解"]
 categories: 
diff --git a/java/springboot系列/数据库/springboot整合redis.md b/java/springboot系列/数据库/springboot整合redis.md
index 939fe74..df2d22f 100644
--- a/java/springboot系列/数据库/springboot整合redis.md
+++ b/java/springboot系列/数据库/springboot整合redis.md
@@ -1,7 +1,8 @@
 ---
 id: "2019-02-22-14-59"
-title: "springboot整合Mybatis(xml和注解)"
-tag: ["java", "","spring-boot","redis","nosql"]
+date: "2019/02/22 14:59:00"
+title: "springboot整合redis"
+tag: ["java","spring-boot","redis","nosql"]
 categories: 
 - "java"
 - "spring boot学习"
diff --git a/java/springboot系列/消息队列/springboot整合activeMQ（1）.md b/java/springboot系列/消息队列/springboot整合activeMQ（1）.md
index 89ed3ee..68370b8 100644
--- a/java/springboot系列/消息队列/springboot整合activeMQ（1）.md
+++ b/java/springboot系列/消息队列/springboot整合activeMQ（1）.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-09-05-10-38"
-date: "2018-09-05-10-38"
+date: "2018/09/05 10:38:00"
 title: "springboot整合ActiveMQ（1）"
 tags: ["java", "spring","springboot","消息队列","activeMQ"]
 categories: 
diff --git a/java/springboot系列/消息队列/springboot整合activeMQ（2）.md b/java/springboot系列/消息队列/springboot整合activeMQ（2）.md
index 58fb88d..293c61c 100644
--- a/java/springboot系列/消息队列/springboot整合activeMQ（2）.md
+++ b/java/springboot系列/消息队列/springboot整合activeMQ（2）.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-09-06-10-38"
-date: "2018-09-06-10-38"
+date: "2018/09/06 10:38:00"
 title: "springboot整合ActiveMQ（2）"
 tags: ["java", "spring","springboot","消息队列","activeMQ"]
 categories: 
diff --git a/java/springboot系列/读写分离配置/springboot配置读写分离.md b/java/springboot系列/读写分离配置/springboot配置读写分离.md
index 9315cd9..62e0229 100644
--- a/java/springboot系列/读写分离配置/springboot配置读写分离.md
+++ b/java/springboot系列/读写分离配置/springboot配置读写分离.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-09-10-10-38"
-date: "2018-09-10-10-38"
+date: "2018/09/10 10:38:00"
 title: "springboot配置读写分离(Mybatis)"
 tags: ["java", "spring","springboot","mysql","主从备份","读写分离"]
 categories: 
diff --git a/java/springcloud实战/1.springCloudConfig使用.md b/java/springcloud实战/1.springCloudConfig使用.md
index 426b266..a3e91c1 100644
--- a/java/springcloud实战/1.springCloudConfig使用.md
+++ b/java/springcloud实战/1.springCloudConfig使用.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-11-19-15-57-00"
-date: "2018-11-19-15-57-00"
+date: "2018/11/19 15:57:00"
 title: "springCloud学习1(集中式配置管理)"
 tags: ["spring-boot", "spring-cloud-config","git"]
 categories: 
diff --git a/java/springcloud实战/2.springCloud服务发现.md b/java/springcloud实战/2.springCloud服务发现.md
index f630d21..aa428a0 100644
--- a/java/springcloud实战/2.springCloud服务发现.md
+++ b/java/springcloud实战/2.springCloud服务发现.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-11-22-15-57"
-date: "2018-11-22-15-57"
+date: "2018/11/22 15:57"
 title: "springCloud学习2(服务发现)"
 tags: ["spring-boot", "spring-cloud","eureka"]
 categories: 
diff --git a/java/springcloud实战/3.springCloud与Netflix Hystrix的弹性客户端模式.md b/java/springcloud实战/3.springCloud与Netflix Hystrix的弹性客户端模式.md
index 939ee89..b1d5262 100644
--- a/java/springcloud实战/3.springCloud与Netflix Hystrix的弹性客户端模式.md	
+++ b/java/springcloud实战/3.springCloud与Netflix Hystrix的弹性客户端模式.md	
@@ -1,6 +1,6 @@
 ---
 id: "2018-11-28-15-57-00"
-date: "2018-11-28-15-57-00"
+date: "2018/11/28 15:57:00"
 title: "springCloud学习3（Netflix Hystrix弹性客户端）"
 tags: ["spring-boot", "spring-cloud","netflix-hystrix","熔断"]
 categories: 
diff --git a/java/springcloud实战/4.springCloud之Zuul服务路由.md b/java/springcloud实战/4.springCloud之Zuul服务路由.md
index 4893715..ce52132 100644
--- a/java/springcloud实战/4.springCloud之Zuul服务路由.md
+++ b/java/springcloud实战/4.springCloud之Zuul服务路由.md
@@ -1,6 +1,6 @@
 ---
 id: "2019-01-03-19-19"
-date: "2019-01-03-19-19"
+date: "2019/01/03 19:19"
 title: "springCloud学习4（Zuul服务路由）"
 tags: ["spring-boot", "spring-cloud","netflix-zuul","service-gateway"]
 categories: 
diff --git a/java/springcloud实战/5.springCloud之Spring Cloud Stream事件驱动架构.md b/java/springcloud实战/5.springCloud之Spring Cloud Stream事件驱动架构.md
index 96c5cd9..81b1edb 100644
--- a/java/springcloud实战/5.springCloud之Spring Cloud Stream事件驱动架构.md	
+++ b/java/springcloud实战/5.springCloud之Spring Cloud Stream事件驱动架构.md	
@@ -1,6 +1,6 @@
 ---
 id: "2019-01-03-19-19"
-date: "2019-01-03-19-19"
+date: "2019/01/03 19:19"
 title: "springCloud学习4（Spring-Cloud-Stream事件驱动）"
 tags:
   ["spring-boot", "spring-cloud", "spring-cloud-stream", "kafka", "事件驱动"]
diff --git a/java/其他/Java线程池问题.md b/java/其他/Java线程池问题.md
index 6df525f..e912e25 100644
--- a/java/其他/Java线程池问题.md
+++ b/java/其他/Java线程池问题.md
@@ -1,6 +1,6 @@
 ---
 id: "2019-01-09-20-52"
-date: "2019-01-09-20-52"
+date: "2019/01/09 20:52"
 title: "java线程池使用后到底要不要关闭"
 tags: ["java", "线程池", "ThreadPoolExecutor"]
 categories:
diff --git a/java/其他/java导出EXCEL文件.md b/java/其他/java导出EXCEL文件.md
index bb2c198..fe81004 100644
--- a/java/其他/java导出EXCEL文件.md
+++ b/java/其他/java导出EXCEL文件.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-09-22-15-57"
-date: "2018-09-22-15-57"
+date: "2018/09/22 15:57"
 title: "java导出EXCEL文件"
 tags: ["reflex", "java","excel","SXSSFWorksheet"]
 categories: 
diff --git a/linux/docker/1.linux下docker安装与配置.md b/linux/docker/1.linux下docker安装与配置.md
index 042a2c9..730490b 100644
--- a/linux/docker/1.linux下docker安装与配置.md
+++ b/linux/docker/1.linux下docker安装与配置.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-11-20-10-38-05"
-date: "2018-11-20-10-38-05"
+date: "2018/11/20 10:38:05"
 title: "1.linux下mongodb的配置与安装"
 tags: ["docker", "linux","ubuntu"]
 categories: 
diff --git a/linux/docker/2.docker简单使用教程.md b/linux/docker/2.docker简单使用教程.md
index dd6e6e6..c382eb3 100644
--- a/linux/docker/2.docker简单使用教程.md
+++ b/linux/docker/2.docker简单使用教程.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-12-26-13-18"
-date: "2018-12-26-13-18"
+date: "2018/12/26 13:18"
 title: "2.docker简单使用教程"
 tags: ["docker","mysql"]
 categories: 
diff --git a/linux/docker/3.docker部署java应用.md b/linux/docker/3.docker部署java应用.md
index 8671fbf..e1cee61 100644
--- a/linux/docker/3.docker部署java应用.md
+++ b/linux/docker/3.docker部署java应用.md
@@ -1,6 +1,6 @@
 ---
 id: "2019-02-01-14-05"
-date: "2019-02-01-14-05"
+date: "2019/02/01 14:05"
 title: "3.从零开始在docker中部署java应用"
 tags: ["docker","springboot","jar","war","elastricsearch","activemq"]
 categories: 
diff --git a/linux/软件安装/docker下mysql启动报错.md b/linux/软件安装/docker下mysql启动报错.md
index ebbdd4e..d6e8bf7 100644
--- a/linux/软件安装/docker下mysql启动报错.md
+++ b/linux/软件安装/docker下mysql启动报错.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-12-26-11-50"
-date: "2018-12-26-11-50"
+date: "2018/12/26 11:50"
 title: "docker下mysql启动报错"
 tags: ["docker","mysql"]
 categories: 
diff --git a/linux/软件安装/linux下mongodb的安装与配置(非atp).md b/linux/软件安装/linux下mongodb的安装与配置(非atp).md
index bfb1b80..66223a6 100644
--- a/linux/软件安装/linux下mongodb的安装与配置(非atp).md
+++ b/linux/软件安装/linux下mongodb的安装与配置(非atp).md
@@ -1,6 +1,6 @@
 ---
 id: "2018-11-20-10-38-05"
-date: "2018-11-20-10-38-05"
+date: "2018/11/20 10:38:05"
 title: "linux下mongodb的配置与安装"
 tags: ["mongodb", "linux"]
 categories: 
diff --git a/node/环境配置/vscode开发调试typescript.md b/node/环境配置/vscode开发调试typescript.md
index ad00812..d963e73 100644
--- a/node/环境配置/vscode开发调试typescript.md
+++ b/node/环境配置/vscode开发调试typescript.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-12-17-13-58"
-date: "2018-12-17-13-58"
+date: "2018/12/17 13:58"
 title: "vscode开发调试typescript"
 tags: ["vscode", "node","typescript","ts"]
 categories: 
diff --git a/node/项目/node,vue开发教学管理系统.md b/node/项目/node,vue开发教学管理系统.md
index bcf4a9f..7b11c24 100644
--- a/node/项目/node,vue开发教学管理系统.md
+++ b/node/项目/node,vue开发教学管理系统.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-10-01-13-58"
-date: "2018-10-01-13-58"
+date: "2018/10/01 13:58"
 title: "node,vue开发教学管理系统"
 tags: ["node", "vue","element-ui","axios","koa","redis","mysql","jwt"]
 categories: 
diff --git a/其他各种/git crlf、lf自动转换引起的问题.md b/其他各种/git crlf、lf自动转换引起的问题.md
index 270c601..fca9915 100644
--- a/其他各种/git crlf、lf自动转换引起的问题.md	
+++ b/其他各种/git crlf、lf自动转换引起的问题.md	
@@ -1,6 +1,6 @@
 ---
 id: "2018-09-20-10-58"
-date: "2018-09-20-10-58"
+date: "2018/09/20 10:58"
 title: "git crlf、lf自动转换问题"
 tags: ["git","crlf","lf","flyway"]
 categories: 
diff --git a/其他各种/正则表达式在密码匹配中的使用.md b/其他各种/正则表达式在密码匹配中的使用.md
index e9905be..1da51be 100644
--- a/其他各种/正则表达式在密码匹配中的使用.md
+++ b/其他各种/正则表达式在密码匹配中的使用.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-09-30-10-58"
-date: "2018-09-30-10-58"
+date: "2018/09/30 10:58"
 title: "正则匹配之正向/反向预测先行搜索"
 tags: ["java","正则匹配","pattern","预测先行搜索"]
 categories: 
diff --git a/数据库/分布式/分布式事务.md b/数据库/分布式/分布式事务.md
index 64895a9..6c320ac 100644
--- a/数据库/分布式/分布式事务.md
+++ b/数据库/分布式/分布式事务.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-10-03-10-58"
-date: "2018-10-03-10-58"
+date: "2018/10/03 10:58"
 title: "分布式事务"
 tags: ["分布式","sql","2PC","TCC","异步补偿"]
 categories: 
diff --git a/数据库/分布式/数据库事务四个特性及隔离级别.md b/数据库/分布式/数据库事务四个特性及隔离级别.md
index 8752780..d19015a 100644
--- a/数据库/分布式/数据库事务四个特性及隔离级别.md
+++ b/数据库/分布式/数据库事务四个特性及隔离级别.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-10-02-10-58"
-date: "2018-10-02-10-58"
+date: "2018/10/02 10:58"
 title: "数据库隔离特性"
 tags: ["原子","ACID","事务"]
 categories: 
diff --git a/数据库/基础/1.mysql使用查询结果进行插入操作.md b/数据库/基础/1.mysql使用查询结果进行插入操作.md
index 9015436..0f4c72c 100644
--- a/数据库/基础/1.mysql使用查询结果进行插入操作.md
+++ b/数据库/基础/1.mysql使用查询结果进行插入操作.md
@@ -1,6 +1,6 @@
 ---
 id: "2019-01-25-09-48"
-date: "2019-01-25-09-48"
+date: "2019/01/25 09:48"
 title: "mysql使用查询结果进行插入操作"
 tags: ["mysql","select","insert"]
 categories: 
diff --git a/算法/leetcode/Q807 保持城市天际线(Max Increase to Keep City Skyline).md b/算法/leetcode/Q807 保持城市天际线(Max Increase to Keep City Skyline).md
index 90ff48b..11cc5bc 100644
--- a/算法/leetcode/Q807 保持城市天际线(Max Increase to Keep City Skyline).md	
+++ b/算法/leetcode/Q807 保持城市天际线(Max Increase to Keep City Skyline).md	
@@ -1,6 +1,6 @@
 ---
 id: "2019-01-02-17-15"
-date: "2019-01-02-17-15"
+date: "2019/01/02 17:15"
 title: "Q807 保持城市天际线(Max Increase to Keep City Skyline)"
 tags: ["java", "leetcode","array",'leetcode']
 categories: 
diff --git a/网络/nat模式虚拟机主机相互ping通.md b/网络/nat模式虚拟机主机相互ping通.md
index 85be28e..2cc88ac 100644
--- a/网络/nat模式虚拟机主机相互ping通.md
+++ b/网络/nat模式虚拟机主机相互ping通.md
@@ -1,6 +1,6 @@
 ---
 id: "2018-08-04-10-58"
-date: "2018-08-04-10-58"
+date: 2018/08/04 10:58:00
 title: "nat模式虚拟机主机相互ping通"
 tags: ["vmware","nat","ping","ubuntu"]
 categories: