README.md

@@ -119,8 +119,8 @@ ps: 虽然我知道，大部分人都是来了**直接下载源代码**后就潇
 
 1. 使用IDE导入本项目
 2. 新建数据库`CREATE DATABASE dblog;`
-3. 导入数据库`docs/db/dblog.sql`
-4. 初始化数据库`docs/db/init_data.sql`
+3. 导入数据库`docs/docker/mysql/dblog.sql`
+4. 初始化数据库`docs/docker/mysql/init_data.sql`
 5. 修改配置文件
    1. 数据库链接属性(在`[blog-core]/resources/config/application-center-{env}.yml`配置文件中搜索`datasource`或定位到L.5) 
    2. redis配置(在`[blog-core]/resources/config/application-center-{env}.yml`配置文件中搜索`redis`或定位到L.14)

blog-admin/src/main/resources/logback-spring.xml

@@ -32,7 +32,7 @@
 
     <!-- 测试环境+开发环境，日志级别为INFO且不写日志文件 -->
     <springProfile name="dev">
-        <root level="INFO">
+        <root level="DEDBUG">
             <appender-ref ref="STDOUT"/>
         </root>
     </springProfile>

blog-core/src/main/resources/config/application-center.yml

@@ -5,12 +5,12 @@ spring:
     # 指定SMTP server使用的协议，默认为: smtp
     protocol: smtp
     # 指定SMTP server host.
-    host: ${ONEBLOG_MAIL_HOST}
+    host: ${ONEBLOG_MAIL_HOST:x}
     port: ${ONEBLOG_MAIL_PORT:465}
     # 指定SMTP server的用户名.
-    username: ${ONEBLOG_MAIL_USERNAME}
+    username: ${ONEBLOG_MAIL_USERNAME:x}
     # 指定SMTP server登录密码:
-    password: ${ONEBLOG_MAIL_PASSWORD}
+    password: ${ONEBLOG_MAIL_PASSWORD:x}
     # 指定是否在启动时测试邮件服务器连接，默认为false
     test-connection: false
     properties:

blog-web/src/main/resources/templates/layout/sidebar.ftl

@@ -48,7 +48,7 @@
     </#if>
     <div class="sidebar-module article-module hide" style="top: 0;">
         <h5 class="custom-title"><i class="fa fa-book fa-fw icon"></i><strong>本文目录</strong><i class="fa fa-close pull-right close-article-menu hide pointer"></i><small></small></h5>
-        <div id="article-menu">
+        <div id="article-menu" style="overflow:auto">
             <ul class="list-unstyled"></ul>
         </div>
     </div>

pom.xml

@@ -35,9 +35,9 @@
         <hibernate.validator.version>6.0.9.Final</hibernate.validator.version>
         <tomcat.version>8.5.57</tomcat.version>
         <excel4j.version>2.1.4-Final</excel4j.version>
-        <mybatis.version>1.3.2</mybatis.version>
-        <mapper.version>2.1.0</mapper.version>
-        <pagehelper.version>1.2.3</pagehelper.version>
+        <mybatis.version>2.1.4</mybatis.version>
+        <mapper.version>2.1.5</mapper.version>
+        <pagehelper.version>1.3.0</pagehelper.version>
         <druid.version>1.1.10</druid.version>
         <fastjson.version>1.2.76</fastjson.version>
         <shiro.spring.version>1.7.1</shiro.spring.version>