From 41830a315c003153a50d6289f8632c8463a6f0b7 Mon Sep 17 00:00:00 2001
From: bootdo <1992lcg@163.com>
Date: Tue, 27 Feb 2018 14:11:01 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=B8=8E=E4=BB=A3=E7=A0=81=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=EF=BC=8CsysDict=E5=8E=BB=E6=8E=89=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...5\205\274\345\256\271\347\211\210\346\234\254).sql" | 10 +++++-----
 bootdo/bootdo.sql                                      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git "a/bootdo/bootdo(\345\246\202\346\236\234\346\212\245\351\224\231\350\257\267\346\211\247\350\241\214\350\277\231\344\270\252\345\205\274\345\256\271\347\211\210\346\234\254).sql" "b/bootdo/bootdo(\345\246\202\346\236\234\346\212\245\351\224\231\350\257\267\346\211\247\350\241\214\350\277\231\344\270\252\345\205\274\345\256\271\347\211\210\346\234\254).sql"
index e9c31d5..345e975 100644
--- "a/bootdo/bootdo(\345\246\202\346\236\234\346\212\245\351\224\231\350\257\267\346\211\247\350\241\214\350\277\231\344\270\252\345\205\274\345\256\271\347\211\210\346\234\254).sql"
+++ "b/bootdo/bootdo(\345\246\202\346\236\234\346\212\245\351\224\231\350\257\267\346\211\247\350\241\214\350\277\231\344\270\252\345\205\274\345\256\271\347\211\210\346\234\254).sql"
@@ -802,11 +802,11 @@ INSERT INTO `sys_menu` VALUES ('74', '73', '增加', '/system/sysDept/add', 'sys
 INSERT INTO `sys_menu` VALUES ('75', '73', '刪除', 'system/sysDept/remove', 'system:sysDept:remove', '2', null, '2', null, null);
 INSERT INTO `sys_menu` VALUES ('76', '73', '编辑', '/system/sysDept/edit', 'system:sysDept:edit', '2', null, '3', null, null);
 INSERT INTO `sys_menu` VALUES ('77', '0', '系统工具', '', '', '0', 'fa fa-gear', '4', null, null);
-INSERT INTO `sys_menu` VALUES ('78', '1', '数据字典', '/common/sysDict', 'common:sysDict:sysDict', '1', 'fa fa-book', '1', null, null);
-INSERT INTO `sys_menu` VALUES ('79', '78', '增加', '/common/sysDict/add', 'common:sysDict:add', '2', null, '2', null, null);
-INSERT INTO `sys_menu` VALUES ('80', '78', '编辑', '/common/sysDict/edit', 'common:sysDict:edit', '2', null, '2', null, null);
-INSERT INTO `sys_menu` VALUES ('81', '78', '删除', '/common/sysDict/remove', 'common:sysDict:remove', '2', '', '3', null, null);
-INSERT INTO `sys_menu` VALUES ('83', '78', '批量删除', '/common/sysDict/batchRemove', 'common:sysDict:batchRemove', '2', '', '4', null, null);
+INSERT INTO `sys_menu` VALUES ('78', '1', '数据字典', '/common/dict', 'common:dict:dict', '1', 'fa fa-book', '1', null, null);
+INSERT INTO `sys_menu` VALUES ('79', '78', '增加', '/common/dict/add', 'common:dict:add', '2', null, '2', null, null);
+INSERT INTO `sys_menu` VALUES ('80', '78', '编辑', '/common/dict/edit', 'common:dict:edit', '2', null, '2', null, null);
+INSERT INTO `sys_menu` VALUES ('81', '78', '删除', '/common/dict/remove', 'common:dict:remove', '2', '', '3', null, null);
+INSERT INTO `sys_menu` VALUES ('83', '78', '批量删除', '/common/dict/batchRemove', 'common:dict:batchRemove', '2', '', '4', null, null);
 INSERT INTO `sys_menu` VALUES ('84', '0', '办公管理', '', '', '0', 'fa fa-laptop', '5', null, null);
 INSERT INTO `sys_menu` VALUES ('85', '84', '通知公告', 'oa/notify', 'oa:notify:notify', '1', 'fa fa-pencil-square', null, null, null);
 INSERT INTO `sys_menu` VALUES ('86', '85', '新增', 'oa/notify/add', 'oa:notify:add', '2', 'fa fa-plus', '1', null, null);
diff --git a/bootdo/bootdo.sql b/bootdo/bootdo.sql
index c2b590e..d373425 100644
--- a/bootdo/bootdo.sql
+++ b/bootdo/bootdo.sql
@@ -1091,11 +1091,11 @@ INSERT INTO `sys_menu` VALUES ('74', '73', '增加', '/system/sysDept/add', 'sys
 INSERT INTO `sys_menu` VALUES ('75', '73', '刪除', 'system/sysDept/remove', 'system:sysDept:remove', '2', null, '2', null, null);
 INSERT INTO `sys_menu` VALUES ('76', '73', '编辑', '/system/sysDept/edit', 'system:sysDept:edit', '2', null, '3', null, null);
 INSERT INTO `sys_menu` VALUES ('77', '0', '系统工具', '', '', '0', 'fa fa-gear', '4', null, null);
-INSERT INTO `sys_menu` VALUES ('78', '1', '数据字典', '/common/sysDict', 'common:sysDict:sysDict', '1', 'fa fa-book', '1', null, null);
-INSERT INTO `sys_menu` VALUES ('79', '78', '增加', '/common/sysDict/add', 'common:sysDict:add', '2', null, '2', null, null);
-INSERT INTO `sys_menu` VALUES ('80', '78', '编辑', '/common/sysDict/edit', 'common:sysDict:edit', '2', null, '2', null, null);
-INSERT INTO `sys_menu` VALUES ('81', '78', '删除', '/common/sysDict/remove', 'common:sysDict:remove', '2', '', '3', null, null);
-INSERT INTO `sys_menu` VALUES ('83', '78', '批量删除', '/common/sysDict/batchRemove', 'common:sysDict:batchRemove', '2', '', '4', null, null);
+INSERT INTO `sys_menu` VALUES ('78', '1', '数据字典', '/common/dict', 'common:dict:dict', '1', 'fa fa-book', '1', null, null);
+INSERT INTO `sys_menu` VALUES ('79', '78', '增加', '/common/dict/add', 'common:dict:add', '2', null, '2', null, null);
+INSERT INTO `sys_menu` VALUES ('80', '78', '编辑', '/common/dict/edit', 'common:dict:edit', '2', null, '2', null, null);
+INSERT INTO `sys_menu` VALUES ('81', '78', '删除', '/common/dict/remove', 'common:dict:remove', '2', '', '3', null, null);
+INSERT INTO `sys_menu` VALUES ('83', '78', '批量删除', '/common/dict/batchRemove', 'common:dict:batchRemove', '2', '', '4', null, null);
 INSERT INTO `sys_menu` VALUES ('84', '0', '办公管理', '', '', '0', 'fa fa-laptop', '5', null, null);
 INSERT INTO `sys_menu` VALUES ('85', '84', '通知公告', 'oa/notify', 'oa:notify:notify', '1', 'fa fa-pencil-square', null, null, null);
 INSERT INTO `sys_menu` VALUES ('86', '85', '新增', 'oa/notify/add', 'oa:notify:add', '2', 'fa fa-plus', '1', null, null);
-- 
Gitee


From c1187fd2ca9fbcb75a4aed67f592d07a59fbccbd Mon Sep 17 00:00:00 2001
From: lcg0124 <1992lcg@163.com>
Date: Wed, 28 Feb 2018 17:17:35 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9bd59b2..74ff4b0 100644
--- a/README.md
+++ b/README.md
@@ -83,4 +83,7 @@ BootDo 提供了常用工具进行封装，包括日志工具、缓存工具、
 
 本软件使用 [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0) 协议，请严格遵照协议内容
 
-- [x] 注：已上内容为整体规化，部分功能还在实现中
\ No newline at end of file
+- [x] 注：已上内容为整体规化，部分功能还在实现中
+
+如果感觉对您又帮助，请作者喝杯咖啡吧，请注明您的名字或者昵称，方便作者感谢o(*￣︶￣*)o
+![输入图片说明](https://gitee.com/uploads/images/2018/0228/171720_ab474b9d_1204498.jpeg "843167056429717736.jpg")![输入图片说明](https://gitee.com/uploads/images/2018/0228/171730_04500365_1204498.jpeg "12959670678378076.jpg")
\ No newline at end of file
-- 
Gitee


From e6597772860bd2964753d724333ce3f317ce415d Mon Sep 17 00:00:00 2001
From: lcg0124 <1992lcg@163.com>
Date: Wed, 28 Feb 2018 17:19:45 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 74ff4b0..d251263 100644
--- a/README.md
+++ b/README.md
@@ -86,4 +86,5 @@ BootDo 提供了常用工具进行封装，包括日志工具、缓存工具、
 - [x] 注：已上内容为整体规化，部分功能还在实现中
 
 如果感觉对您又帮助，请作者喝杯咖啡吧，请注明您的名字或者昵称，方便作者感谢o(*￣︶￣*)o
-![输入图片说明](https://gitee.com/uploads/images/2018/0228/171720_ab474b9d_1204498.jpeg "843167056429717736.jpg")![输入图片说明](https://gitee.com/uploads/images/2018/0228/171730_04500365_1204498.jpeg "12959670678378076.jpg")
\ No newline at end of file
+![输入图片说明](https://gitee.com/uploads/images/2018/0228/171923_297225b7_1204498.jpeg "在这里输入图片标题")
+![输入图片说明](https://gitee.com/uploads/images/2018/0228/171942_39b644cb_1204498.jpeg "12959670678378076.jpg")
\ No newline at end of file
-- 
Gitee


From f9e8d27e60d8d5244f1da57f9dc23d1ab3cd5b8b Mon Sep 17 00:00:00 2001
From: lcg0124 <1992lcg@163.com>
Date: Wed, 28 Feb 2018 17:22:18 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d251263..a62d93d 100644
--- a/README.md
+++ b/README.md
@@ -86,5 +86,4 @@ BootDo 提供了常用工具进行封装，包括日志工具、缓存工具、
 - [x] 注：已上内容为整体规化，部分功能还在实现中
 
 如果感觉对您又帮助，请作者喝杯咖啡吧，请注明您的名字或者昵称，方便作者感谢o(*￣︶￣*)o
-![输入图片说明](https://gitee.com/uploads/images/2018/0228/171923_297225b7_1204498.jpeg "在这里输入图片标题")
-![输入图片说明](https://gitee.com/uploads/images/2018/0228/171942_39b644cb_1204498.jpeg "12959670678378076.jpg")
\ No newline at end of file
+![输入图片说明](https://gitee.com/uploads/images/2018/0228/172207_751b45c4_1204498.jpeg "843167056429717736.jpg")![输入图片说明](https://gitee.com/uploads/images/2018/0228/172216_fbcc5c30_1204498.jpeg "12959670678378076.jpg")
\ No newline at end of file
-- 
Gitee


From e98e6272cde302c4c5de3a83d86acd8a184db911 Mon Sep 17 00:00:00 2001
From: lcg0124 <1992lcg@163.com>
Date: Thu, 1 Mar 2018 08:52:41 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a62d93d..d9fc60a 100644
--- a/README.md
+++ b/README.md
@@ -85,5 +85,5 @@ BootDo 提供了常用工具进行封装，包括日志工具、缓存工具、
 
 - [x] 注：已上内容为整体规化，部分功能还在实现中
 
-如果感觉对您又帮助，请作者喝杯咖啡吧，请注明您的名字或者昵称，方便作者感谢o(*￣︶￣*)o
+如果感觉对您有帮助，请作者喝杯咖啡吧，请注明您的名字或者昵称，方便作者感谢o(*￣︶￣*)o
 ![输入图片说明](https://gitee.com/uploads/images/2018/0228/172207_751b45c4_1204498.jpeg "843167056429717736.jpg")![输入图片说明](https://gitee.com/uploads/images/2018/0228/172216_fbcc5c30_1204498.jpeg "12959670678378076.jpg")
\ No newline at end of file
-- 
Gitee


From 7e91fb85c1efb31b9b842e038f35331bd432e29f Mon Sep 17 00:00:00 2001
From: bootdo <1992lcg@163.com>
Date: Thu, 8 Mar 2018 10:54:09 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/blog/index/include_blog.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootdo/src/main/resources/templates/blog/index/include_blog.html b/bootdo/src/main/resources/templates/blog/index/include_blog.html
index f1d52be..4ea1bc0 100644
--- a/bootdo/src/main/resources/templates/blog/index/include_blog.html
+++ b/bootdo/src/main/resources/templates/blog/index/include_blog.html
@@ -87,7 +87,7 @@
 					class="icon-bar"></span> <span class="icon-bar"></span> <span
 					class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand" href="index.html" style="font-size: 24px;">BootDo</a>
+			<a class="navbar-brand" href="/" style="font-size: 24px;">BootDo</a>
 		</div>
 		<div class="collapse navbar-collapse"
 			id="bs-example-navbar-collapse-1">
-- 
Gitee


From 216d6a4451e2dfcc214b7ccf4a40a2dbff9e657a Mon Sep 17 00:00:00 2001
From: bootdo <1992lcg@163.com>
Date: Wed, 14 Mar 2018 11:35:37 +0800
Subject: [PATCH 7/7] =?UTF-8?q?aop=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bootdo/pom.xml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/bootdo/pom.xml b/bootdo/pom.xml
index 2a2a84c..0232afc 100644
--- a/bootdo/pom.xml
+++ b/bootdo/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.bootdo</groupId>
     <artifactId>bootdo</artifactId>
-    <version>1.6.3</version>
+    <version>1.6.9</version>
     <packaging>jar</packaging>
 
     <name>bootdo</name>
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.6.RELEASE</version>
+        <version>1.5.9.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -214,10 +214,23 @@
             <version>1.9.2</version>
         </dependency>
 
+        <!--war包部署需要-->
         <!--<dependency>-->
-            <!--<groupId>org.crazycake</groupId>-->
-            <!--<artifactId>shiro-redis</artifactId>-->
-            <!--<version>2.4.2.1-RELEASE</version>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-starter-web</artifactId>-->
+            <!--&lt;!&ndash; 移除嵌入式tomcat插件 &ndash;&gt;-->
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.springframework.boot</groupId>-->
+                    <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>javax.servlet</groupId>-->
+            <!--<artifactId>javax.servlet-api</artifactId>-->
+            <!--<version>3.1.0</version>-->
+            <!--<scope>provided</scope>-->
         <!--</dependency>-->
     </dependencies>
     <build>
-- 
Gitee