v3.3.0发布

2025-07-01 07:16:39 +00:00 · 2020-12-28 12:06:19 +08:00 · 2020-12-28 12:02:34 +08:00 · 2020-12-28 11:06:27 +08:00 · 2020-12-28 10:58:38 +08:00 · 2020-12-28 09:34:22 +08:00
1252 changed files with 125448 additions and 367 deletions
--- a/README.md
+++ b/README.md
@ -2,6 +2,10 @@

 # 小说精品屋-plus

+#### 官网
+
+https://xiongxyang.gitee.io/home/
+
 #### 新项目：小说精品屋-微服务版

 基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台。
@ -15,13 +19,9 @@ Gitee仓库地址： https://gitee.com/novel_dev_team/novel-cloud
 [点击前往](http://47.106.243.172:8888/)


-#### 前言
-
-小说精品屋-plus致力于打造一个完整的商用小说门户平台，使用前建议先阅读此文档。
-
 #### 项目介绍

-小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、移动）阅读、功能完善的小说原创/爬虫网站项目，既包含了作家专区供原创作者上传小说，又提供了爬虫工具通过规则多线程全自动采集任意小说网站数据（已兼容99%的小说网站），新书自动入库，老书自动更新。
+小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、WAP）阅读、功能完善的原创文学CMS系统，由前台门户系统、作家后台管理系统、平台后台管理系统、爬虫管理系统等多个子系统构成，支持会员充值、订阅模式、新闻发布和实时统计报表等功能。

 小说精品屋-plus重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：

@ -29,6 +29,7 @@ Gitee仓库地址： https://gitee.com/novel_dev_team/novel-cloud
 - [x] 服务端代码重构，MyBatis3升级为MyBatis3DynamicSql。
 - [x] 移动站与PC站站点分离，浏览器自动识别跳转。
 - [x] PC站UI更新。
+- [x] 支持前端模版自定义，内置多套模版。
 - [x] 新闻模块。
 - [x] 排行榜。
 - [x] 小说评论模块。
@ -44,9 +45,10 @@ Gitee仓库地址： https://gitee.com/novel_dev_team/novel-cloud
 ```
 novel-plus -- 父工程
 ├── novel-common -- 通用模块
-├── novel-front -- 前台门户系统
-├── novel-crawl -- 爬虫管理系统
-└── novel-admin -- 后台管理系统
+├── novel-front -- 前台门户&作家后台管理子系统（可拆分）
+├── novel-crawl -- 爬虫管理子系统
+├── novel-admin -- 平台后台管理子系统
+└── templates -- 前端模版
 ```

 #### 技术选型
@ -78,13 +80,14 @@ novel-plus -- 父工程

 #### 接口文档

-[点击查看接口文档示例](./doc/api.md)
+[点击查看接口文档示例](doc/api/api.md)

-#### PC站截图
+#### 橙色主题模版截图
+##### PC站截图

 1. 首页

-![img](https://oscimg.oschina.net/oscnet/up-bbb1c7f72e183327bff754a9fa8bb75223e.png)
+![img](https://s3.ax1x.com/2020/12/27/r5400A.png)

 2. 分类索引页

@ -92,7 +95,7 @@ novel-plus -- 父工程

 3. 搜索页

-![img](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ20200520-215756.png)
+![img](https://s3.ax1x.com/2020/12/27/r5TO8x.png)

 ![img](https://oscimg.oschina.net/oscnet/up-ed5f689557718924acac76bc3ebca36afcb.png)

@ -134,31 +137,31 @@ novel-plus -- 父工程

 ![img](https://oscimg.oschina.net/oscnet/up-f849960f4c1303fea77d26e64fc505a7180.png)

-#### 手机站截图
+##### 手机站截图

 1. 首页

-   <img src="https://s3.ax1x.com/2020/12/04/DbsSoj.jpg" alt="index" style="zoom:33%;" />
+   <img src="https://s3.ax1x.com/2020/12/27/r5447n.jpg" alt="index" width="300" />

 2. 小说列表页

-   <img src="https://s3.ax1x.com/2020/12/04/DbrfsO.jpg" alt="微信图片_20190904181558" style="zoom: 33%;" />
+   <img src="https://s3.ax1x.com/2020/12/27/r55xKg.jpg" alt="微信图片_20190904181558" width="300" />

 3. 小说详情页

-   <img src="https://s3.ax1x.com/2020/12/04/DbsklV.jpg" alt="QQ图片20191018161901" style="zoom:33%;" />
+   <img src="https://s3.ax1x.com/2020/12/28/roZWOf.jpg" alt="QQ图片20191018161901" width="300" />

 4. 小说阅读页

-   <img src="https://s3.ax1x.com/2020/12/04/Dbsew4.jpg" alt="QQ图片20191018161901" style="zoom:33%;" />
+   <img src="https://s3.ax1x.com/2020/12/27/r55Stx.jpg" alt="QQ图片20191018161901" width="300" />

-#### 爬虫管理系统截图
+##### 爬虫管理系统截图

 ![img](https://s1.ax1x.com/2020/11/03/BsOgbD.png)

 ![img](https://s1.ax1x.com/2020/11/03/BsOHr8.png)

-#### 后台管理系统截图
+##### 后台管理系统截图

 ![img](https://oscimg.oschina.net/oscnet/up-0552343538674a22a64819834100558f39b.png)

@ -168,6 +171,36 @@ novel-plus -- 父工程

 ![img](https://oscimg.oschina.net/oscnet/up-faf5dda7320674c29a1772bc0c81d74762e.png)

+#### 深色主题模版截图
+##### PC站截图
+
+1. 首页
+
+   ![index](https://static.oschina.net/uploads/img/202006/24151811_wIus.png)
+
+##### 手机站截图
+1. 首页
+
+   ![index](https://static.oschina.net/uploads/img/202006/24151812_OOob.jpg)
+
+4. 小说详情页
+
+   ![微信图片_20190904181558](https://static.oschina.net/uploads/img/202006/24151812_ZosF.png)
+
+5. 目录页
+
+   ![QQ图片20191018161901](https://static.oschina.net/uploads/img/202006/24151812_Krva.png)
+
+5. 小说阅读页
+
+   ![QQ图片20191018161901](https://static.oschina.net/uploads/img/202006/24151813_fDgT.png)
+
+#### 蓝色主题模版截图（更新中）
+
+   ![QQ图片20191018161901](https://s3.ax1x.com/2020/12/27/r5Fe0A.png)
+
+
+
 #### 安装步骤

 ##### 数据库安装：
@ -175,41 +208,51 @@ novel-plus -- 父工程
 1. 安装MySQL软件。
 2. 修改MySQL`max_allowed_packet `配置（建议100M）。
 3. 新建数据库，设置编码为utf8mb4。
-4. 执行sql/novel_plus.sql脚本文件。
+4. 执行doc/sql/novel_plus.sql脚本文件。

 ##### 爬虫管理系统安装：

-1.  修改novel-common模块下application-dev.yml文件中的数据库的配置。
+1. 修改novel-common模块下application-common-dev.yml配置文件中的数据库配置。
 2. 修改novel-crawl模块下application.yml文件中的管理员账号密码。
 3. 启动程序，打开浏览器，默认8081端口访问。
 4. 选择已有或新增爬虫源（支持自定义爬虫规则），点击`开启`按钮，开始爬取小说数据。

-##### 前台小说门户安装：
+##### 前台小说门户安装（jar包形式部署时，需要复制templates文件夹到jar文件的相同目录下）：

-1. 修改novel-common模块下application-dev.yml文件中的数据库的配置。
-2. 启动程序，打开浏览器，默认8080端口访问。
+1. 修改novel-common模块下application-common-dev.yml配置文件中的数据库配置。
+2. 修改novel-front模块下application-website配置文件中的网站信息。
+![mini-code](https://s3.ax1x.com/2020/12/28/royaex.png)   
+3. 修改novel-front模块下application.yml配置文件中的模版名为你需要使用的模版名（templates文件夹下的模版文件夹名）（内置orange和dark两套模版）。
+![mini-code](https://s3.ax1x.com/2020/12/26/r4uGM6.png)   
+4. 启动程序，打开浏览器，默认8080端口访问。

 **喜欢此项目的可以给我的GitHub和Gitee加个Star支持一下 。**

 #### 其他安装教程

+##### version<3.3.0版本
+
 包安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4272630) 

 宝塔安装教程（非官方）：[点击前往](https://www.daniao.org/9166.html) 

 docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)

+##### version>=3.3.0版本
+
+包安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4842472) 
+
 #### 代码仓库

 GitHub仓库地址： https://github.com/201206030/novel-plus 
- 
+
 Gitee仓库地址： https://gitee.com/novel_dev_team/novel-plus

 #### QQ交流群

-![mini-code](https://s1.ax1x.com/2020/10/31/BUQVeI.png)
+[点击前往官网查看](https://xiongxyang.gitee.io/home/service.htm)

-#### 微信公众号（发布最新更新资讯）
+#### 微信公众号（发布最新更新资讯、最新前端模版、最新爬虫规则、技术文档等）

 ![mini-code](https://s3.ax1x.com/2020/12/03/DoImOx.png)

--- a/doc/api/api.md
+++ b/doc/api/api.md
--- a/doc/es/index_create.txt
+++ b/doc/es/index_create.txt
--- a/doc/sql/20200511.sql
+++ b/doc/sql/20200511.sql
--- a/doc/sql/20200513.sql
+++ b/doc/sql/20200513.sql
--- a/doc/sql/20200518.sql
+++ b/doc/sql/20200518.sql
--- a/doc/sql/20200608.sql
+++ b/doc/sql/20200608.sql
--- a/doc/sql/20200615.sql
+++ b/doc/sql/20200615.sql
--- a/doc/sql/20201103.sql
+++ b/doc/sql/20201103.sql
--- a/doc/sql/20201109.sql
+++ b/doc/sql/20201109.sql
--- a/doc/sql/20201122.sql
+++ b/doc/sql/20201122.sql
--- a/doc/sql/20201201.sql
+++ b/doc/sql/20201201.sql
--- a/doc/sql/novel_plus.sql
+++ b/doc/sql/novel_plus.sql
@ -491,13 +491,6 @@ CREATE TABLE `sys_dept` (
 -- ----------------------------
 -- Records of sys_dept
 -- ----------------------------
-INSERT INTO `sys_dept` VALUES ('6', '0', '研发部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('7', '6', '研發一部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('8', '6', '研发二部', '2', '1');
-INSERT INTO `sys_dept` VALUES ('9', '0', '销售部', '2', '1');
-INSERT INTO `sys_dept` VALUES ('10', '9', '销售一部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('11', '0', '产品部', '3', '1');
-INSERT INTO `sys_dept` VALUES ('12', '11', '产品一部', '1', '1');
 INSERT INTO `sys_dept` VALUES ('13', '0', '测试部', '5', '1');
 INSERT INTO `sys_dept` VALUES ('14', '13', '测试一部', '1', '1');
 INSERT INTO `sys_dept` VALUES ('15', '13', '测试二部', '2', '1');
@ -894,52 +887,6 @@ CREATE TABLE `sys_log` (
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1412 DEFAULT CHARSET=utf8 COMMENT='系统日志';

-- ----------------------------
-- Records of sys_log
-- ----------------------------
-INSERT INTO `sys_log` VALUES ('1369', '-1', '获取用户信息为空', '登录', '462', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:21');
-INSERT INTO `sys_log` VALUES ('1370', '-1', '获取用户信息为空', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:26');
-INSERT INTO `sys_log` VALUES ('1371', '1', 'admin', '登录', '98', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:33');
-INSERT INTO `sys_log` VALUES ('1372', '1', 'admin', '请求访问主页', '372', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:09:33');
-INSERT INTO `sys_log` VALUES ('1373', '1', 'admin', '请求访问主页', '28', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:12:41');
-INSERT INTO `sys_log` VALUES ('1374', '1', 'admin', '编辑角色', '11', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:18:42');
-INSERT INTO `sys_log` VALUES ('1375', '1', 'admin', '添加菜单', '2', 'com.java2nb.system.controller.MenuController.add()', null, '127.0.0.1', '2020-05-13 11:19:55');
-INSERT INTO `sys_log` VALUES ('1376', '1', 'admin', '保存菜单', '225', 'com.java2nb.system.controller.MenuController.save()', null, '127.0.0.1', '2020-05-13 11:24:42');
-INSERT INTO `sys_log` VALUES ('1377', '1', 'admin', '编辑菜单', '15', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:54');
-INSERT INTO `sys_log` VALUES ('1378', '1', 'admin', '编辑菜单', '11', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:58');
-INSERT INTO `sys_log` VALUES ('1379', '1', 'admin', '更新菜单', '241', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:12');
-INSERT INTO `sys_log` VALUES ('1380', '1', 'admin', '编辑菜单', '8', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:25:16');
-INSERT INTO `sys_log` VALUES ('1381', '1', 'admin', '更新菜单', '199', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:26');
-INSERT INTO `sys_log` VALUES ('1382', '1', 'admin', '编辑角色', '13', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:26:11');
-INSERT INTO `sys_log` VALUES ('1383', '1', 'admin', '更新角色', '931', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:26:36');
-INSERT INTO `sys_log` VALUES ('1384', '-1', '获取用户信息为空', '登录', '11', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:02');
-INSERT INTO `sys_log` VALUES ('1385', '1', 'admin', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:08');
-INSERT INTO `sys_log` VALUES ('1386', '1', 'admin', '请求访问主页', '27', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:08');
-INSERT INTO `sys_log` VALUES ('1387', '1', 'admin', '登录', '272', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:56');
-INSERT INTO `sys_log` VALUES ('1388', '1', 'admin', '请求访问主页', '109', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:56');
-INSERT INTO `sys_log` VALUES ('1389', '1', 'admin', '编辑角色', '8', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:30:36');
-INSERT INTO `sys_log` VALUES ('1390', '1', 'admin', '更新角色', '567', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:30:42');
-INSERT INTO `sys_log` VALUES ('1391', '-1', '获取用户信息为空', '登录', '246', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:38');
-INSERT INTO `sys_log` VALUES ('1392', '1', 'admin', '登录', '38', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:42');
-INSERT INTO `sys_log` VALUES ('1393', '1', 'admin', '请求访问主页', '110', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:31:43');
-INSERT INTO `sys_log` VALUES ('1394', '1', 'admin', 'error', null, 'http://127.0.0.1/test/order/list', 'org.springframework.jdbc.BadSqlGrammarException: \r\n### Error querying database.  Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\r\n### The error may exist in file [E:\\baseprojectparent\\novel-plus\\novel-admin\\target\\classes\\mybatis\\test\\OrderMapper.xml]\r\n### The error may involve defaultParameterMap\r\n### The error occurred while setting parameters\r\n### SQL: select `id`,`fb_merchant_code`,`merchant_order_sn`,`order_sn`,`platform_order_no`,`trade_no`,`order_state`,`fn_coupon`,`red_packet`,`total_fee`,`order_price`,`fee`,`body`,`attach`,`store_id`,`cashier_id`,`device_no`,`user_id`,`user_logon_id`,`pay_time`,`pay_channel`,`no_cash_coupon_fee`,`cash_coupon_fee`,`cash_fee`,`sign`,`options`,`create_time`,`push_time`,`push_ip`,`mcht_id`,`sn` from fb_order                                      order by id desc             limit ?, ?\r\n### Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist', null, '2020-05-13 11:33:27');
-INSERT INTO `sys_log` VALUES ('1395', '1', 'admin', '登录', '276', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:39:20');
-INSERT INTO `sys_log` VALUES ('1396', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:39:20');
-INSERT INTO `sys_log` VALUES ('1397', '1', 'admin', '登录', '285', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:47:00');
-INSERT INTO `sys_log` VALUES ('1398', '1', 'admin', '请求访问主页', '90', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:47:00');
-INSERT INTO `sys_log` VALUES ('1399', '1', 'admin', '登录', '251', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:48:28');
-INSERT INTO `sys_log` VALUES ('1400', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:48:28');
-INSERT INTO `sys_log` VALUES ('1401', '1', 'admin', '登录', '302', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:09:33');
-INSERT INTO `sys_log` VALUES ('1402', '1', 'admin', '请求访问主页', '88', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:09:34');
-INSERT INTO `sys_log` VALUES ('1403', '1', 'admin', '请求更改用户密码', '3', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:11:49');
-INSERT INTO `sys_log` VALUES ('1404', '1', 'admin', 'admin提交更改用户密码', '140', 'com.java2nb.system.controller.UserController.adminResetPwd()', null, '127.0.0.1', '2020-05-13 14:11:50');
-INSERT INTO `sys_log` VALUES ('1405', '1', 'admin', '请求更改用户密码', '4', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:12:11');
-INSERT INTO `sys_log` VALUES ('1406', '1', 'admin', '登录', '275', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:14:26');
-INSERT INTO `sys_log` VALUES ('1407', '1', 'admin', '请求访问主页', '73', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:14:27');
-INSERT INTO `sys_log` VALUES ('1408', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:38');
-INSERT INTO `sys_log` VALUES ('1409', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:47');
-INSERT INTO `sys_log` VALUES ('1410', '1', 'admin', '登录', '261', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:18:07');
-INSERT INTO `sys_log` VALUES ('1411', '1', 'admin', '请求访问主页', '83', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:18:07');

 -- ----------------------------
 -- Table structure for sys_menu
@ -1047,9 +994,6 @@ CREATE TABLE `sys_role` (
 -- Records of sys_role
 -- ----------------------------
 INSERT INTO `sys_role` VALUES ('1', '超级用户角色', 'admin', '拥有最高权限', '2', '2017-08-12 00:43:52', '2017-08-12 19:14:59');
-INSERT INTO `sys_role` VALUES ('59', '普通用户', null, '基本用户权限', null, null, null);
-INSERT INTO `sys_role` VALUES ('60', '测试', null, '&lt;div&gt;', null, null, null);
-INSERT INTO `sys_role` VALUES ('61', 'test', null, '测试', null, null, null);

 -- ----------------------------
 -- Table structure for sys_role_data_perm
@ -1497,19 +1441,7 @@ CREATE TABLE `sys_user` (
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES ('1', 'admin', '超级管理员', 'd633268afedf209e1e4ea0f5f43228a8', '6', 'admin@example.com', '17699999999', '1', '1', '2017-08-15 21:40:39', '2017-08-15 21:41:00', '96', '2017-12-14 00:00:00', '148', 'ccc', '122;121;', '北京市', '北京市市辖区', '东城区');
-INSERT INTO `sys_user` VALUES ('2', 'test', '临时用户', 'd0af8fa1272ef5a152d9e27763eea293', '6', 'test@bootdo.com', null, '1', '1', '2017-08-14 13:43:05', '2017-08-14 21:15:36', null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('36', 'ldh', '刘德华', 'bfd9394475754fbe45866eba97738c36', '7', 'ldh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('123', 'zxy', '张学友', '35174ba93f5fe7267f1fb3c1bf903781', '6', 'zxy@bootdo', null, '0', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('124', 'wyf', '吴亦凡', 'e179e6f687bbd57b9d7efc4746c8090a', '6', 'wyf@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('130', 'lh', '鹿晗', '7924710cd673f68967cde70e188bb097', '9', 'lh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('131', 'lhc', '令狐冲', 'd515538e17ecb570ba40344b5618f5d4', '6', 'lhc@bootdo.com', null, '0', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('132', 'lyf', '刘亦菲', '7fdb1d9008f45950c1620ba0864e5fbd', '13', 'lyf@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('134', 'lyh', '李彦宏', 'dc26092b3244d9d432863f2738180e19', '8', 'lyh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('135', 'wjl', '王健林', '3967697dfced162cf6a34080259b83aa', '6', 'wjl@bootod.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('136', 'gdg', '郭德纲', '3bb1bda86bc02bf6478cd91e42135d2f', '9', 'gdg@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('137', 'test2', 'test2', '649169898e69272c0e5bc899baf1e904', null, '1179705413@qq.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('138', 'test3', 'test3', '79ba2d0b58d8a2e94f6b18744c8cd280', '16', '1179705413@qq.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO `sys_user` VALUES ('1', 'admin', '超级管理员', 'd633268afedf209e1e4ea0f5f43228a8', '14', 'admin@example.com', '17699999999', '1', '1', '2017-08-15 21:40:39', '2017-08-15 21:41:00', '96', '2017-12-14 00:00:00', '148', 'ccc', '122;121;', '北京市', '北京市市辖区', '东城区');

 -- ----------------------------
 -- Table structure for sys_user_role
--- a/doc/sql/sql文件说明.txt
+++ b/doc/sql/sql文件说明.txt
--- a/novel-admin/pom.xml
+++ b/novel-admin/pom.xml
@ -5,7 +5,7 @@

    <groupId>com.java2nb</groupId>
    <artifactId>novel-admin</artifactId>
-    <version>3.1.0</version>
+    <version>3.3.0</version>
    <packaging>jar</packaging>

    <name>novel-admin</name>
--- a/novel-admin/src/main/resources/application-dev.yml
+++ b/novel-admin/src/main/resources/application-dev.yml
@ -1,5 +1,5 @@
 java2nb:
-  uploadPath: c:/var/java2nb/uploaded_files/
+  uploadPath: /var/pic/
  username: admin
  password: 111111
 logging:
@ -10,7 +10,7 @@ spring:
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: test123456
    #password:
--- a/novel-admin/src/main/resources/templates/main.html
+++ b/novel-admin/src/main/resources/templates/main.html
@ -147,7 +147,7 @@
                            <tr>
                                <td>下载地址</td>
                                <td>
-                                   <a href="https://gitee.com/xiongxyang/fiction_house" target="_blank">Gitee</a> /
+                                   <a href="https://gitee.com/novel_dev_team/fiction_house" target="_blank">Gitee</a> /
                                    <a href="https://github.com/201206030/fiction_house" target="_blank">Github</a>
                                </td>
                            </tr>
@ -155,8 +155,8 @@
                                <td>Gitee</td>
                                <td style="padding-bottom: 0;">
                                    <div class="layui-btn-container">
-                                        <a href='https://gitee.com/xiongxyang/fiction_house/stargazers'><img src='https://gitee.com/xiongxyang/fiction_house/badge/star.svg?theme=dark' alt='star'></img></a>
-                                        <a href='https://gitee.com/xiongxyang/fiction_house/members'><img src='https://gitee.com/xiongxyang/fiction_house/badge/fork.svg?theme=dark' alt='fork'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/fiction_house/stargazers'><img src='https://gitee.com/novel_dev_team/fiction_house/badge/star.svg?theme=dark' alt='star'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/fiction_house/members'><img src='https://gitee.com/novel_dev_team/fiction_house/badge/fork.svg?theme=dark' alt='fork'></img></a>
                                    </div>
                                </td>
                            </tr>
@ -200,7 +200,7 @@
                            <tr>
                                <td>下载地址</td>
                                <td>
-                                    <a href="https://gitee.com/xiongxyang/novel-plus" target="_blank">Gitee</a> /
+                                    <a href="https://gitee.com/novel_dev_team/novel-plus" target="_blank">Gitee</a> /
                                    <a href="https://github.com/201206030/novel-plus" target="_blank">Github</a>
                                </td>
                            </tr>
@ -208,8 +208,8 @@
                                <td>Gitee</td>
                                <td style="padding-bottom: 0;">
                                    <div class="layui-btn-container">
-                                        <a href='https://gitee.com/xiongxyang/novel-plus/stargazers'><img src='https://gitee.com/xiongxyang/novel-plus/badge/star.svg?theme=dark' alt='star'></img></a>
-                                        <a href='https://gitee.com/xiongxyang/novel-plus/members'><img src='https://gitee.com/xiongxyang/novel-plus/badge/fork.svg?theme=dark' alt='fork'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-plus/stargazers'><img src='https://gitee.com/novel_dev_team/novel-plus/badge/star.svg?theme=dark' alt='star'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-plus/members'><img src='https://gitee.com/novel_dev_team/novel-plus/badge/fork.svg?theme=dark' alt='fork'></img></a>
                                    </div>
                                </td>
                            </tr>
@ -253,7 +253,7 @@
                            <tr>
                                <td>下载地址</td>
                                <td>
-                                    <a href="https://gitee.com/xiongxyang/novel-cloud" target="_blank">Gitee</a> /
+                                    <a href="https://gitee.com/novel_dev_team/novel-cloud" target="_blank">Gitee</a> /
                                    <a href="https://github.com/201206030/novel-cloud" target="_blank">Github</a>
                                </td>
                            </tr>
@ -261,8 +261,8 @@
                                <td>Gitee</td>
                                <td style="padding-bottom: 0;">
                                    <div class="layui-btn-container">
-                                        <a href='https://gitee.com/xiongxyang/novel-cloud/stargazers'><img src='https://gitee.com/xiongxyang/novel-cloud/badge/star.svg?theme=dark' alt='star'></img></a>
-                                        <a href='https://gitee.com/xiongxyang/novel-cloud/members'><img src='https://gitee.com/xiongxyang/novel-cloud/badge/fork.svg?theme=dark' alt='fork'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-cloud/stargazers'><img src='https://gitee.com/novel_dev_team/novel-cloud/badge/star.svg?theme=dark' alt='star'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-cloud/members'><img src='https://gitee.com/novel_dev_team/novel-cloud/badge/fork.svg?theme=dark' alt='fork'></img></a>
                                    </div>
                                </td>
                            </tr>
--- a/novel-common/pom.xml
+++ b/novel-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>novel</artifactId>
        <groupId>com.java2nb</groupId>
-        <version>3.1.0</version>
+        <version>3.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/novel-common/src/main/java/com/java2nb/novel/core/advice/CommonExceptionHandler.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/advice/CommonExceptionHandler.java
@ -1,21 +1,30 @@
 package com.java2nb.novel.core.advice;

 import com.java2nb.novel.core.bean.ResultBean;
+import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.exception.BusinessException;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.validation.BindException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;

 /**
 * 通用的异常处理器
 *
 * @author 11797*/
@Slf4j
-@ControllerAdvice
-@ResponseBody
+@RestControllerAdvice(basePackages = "com.java2nb.novel.controller")
 public class CommonExceptionHandler {

+    /**
+     * 处理后台数据校验异常
+     * */
+    @ExceptionHandler(BindException.class)
+    public ResultBean handlerBindException(BindException e){
+        log.error(e.getMessage(),e);
+        return ResultBean.fail(ResponseStatus.PARAM_ERROR);
+    }
+
    /**
     * 处理业务异常
     * */
--- a/novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java
@ -0,0 +1,26 @@
+package com.java2nb.novel.core.advice;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ * 页面异常处理器
+ *
+ * @author 11797
+ */
+@Slf4j
+@ControllerAdvice(basePackages = "com.java2nb.novel.page")
+public class PageExceptionHandler {
+
+
+    /**
+     * 处理所有异常
+     */
+    @ExceptionHandler(Exception.class)
+    public String handlerException(Exception e) {
+        log.error(e.getMessage(), e);
+        //跳转页面过程中出现异常时统一跳转到404页面
+        return "404";
+    }
+}
--- a/novel-common/src/main/java/com/java2nb/novel/core/valid/AddGroup.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/valid/AddGroup.java
@ -0,0 +1,11 @@
+package com.java2nb.novel.core.valid;
+
+/**
+ * 新增数据的校验分组
+ * @author xiongxiaoyang
+ */
+public interface AddGroup {
+
+
+
+}
--- a/novel-common/src/main/java/com/java2nb/novel/core/valid/UpdateGroup.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/valid/UpdateGroup.java
@ -0,0 +1,11 @@
+package com.java2nb.novel.core.valid;
+
+/**
+ * 更新数据的校验分组
+ * @author xiongxiaoyang
+ */
+public interface UpdateGroup {
+
+
+
+}
--- a/novel-common/src/main/java/com/java2nb/novel/entity/User.java
+++ b/novel-common/src/main/java/com/java2nb/novel/entity/User.java
@ -1,36 +1,56 @@
 package com.java2nb.novel.entity;

+import com.java2nb.novel.core.valid.AddGroup;
+import com.java2nb.novel.core.valid.UpdateGroup;
+
 import java.util.Date;
 import javax.annotation.Generated;
+import javax.validation.constraints.*;

 public class User {
+
+    @Null(groups = {AddGroup.class, UpdateGroup.class})
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private Long id;

+
+    @NotBlank(groups = {AddGroup.class},message="手机号不能为空！")
+    @Pattern(groups = {AddGroup.class},regexp="^1[3|4|5|6|7|8|9][0-9]{9}$",message="手机号格式不正确！")
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private String username;

+    @NotBlank(groups = {AddGroup.class},message="密码不能为空！")
+    @Null(groups = {UpdateGroup.class})
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private String password;

+    @Null(groups = {AddGroup.class})
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private String nickName;

+    @Null(groups = {AddGroup.class})
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private String userPhoto;

+    @Null(groups = {AddGroup.class})
+    @Min(value = 0,groups = {UpdateGroup.class})
+    @Max(value = 1,groups = {UpdateGroup.class})
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private Byte userSex;

+    @Null(groups = {AddGroup.class,UpdateGroup.class})
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private Long accountBalance;

+    @Null(groups = {AddGroup.class,UpdateGroup.class})
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private Byte status;

+    @Null(groups = {AddGroup.class,UpdateGroup.class})
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private Date createTime;

+    @Null(groups = {AddGroup.class,UpdateGroup.class})
    @Generated("org.mybatis.generator.api.MyBatisGenerator")
    private Date updateTime;

--- a/novel-crawl/pom.xml
+++ b/novel-crawl/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>novel</artifactId>
        <groupId>com.java2nb</groupId>
-        <version>3.1.0</version>
+        <version>3.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java
@ -1,9 +1,6 @@
 package com.java2nb.novel.core.crawl;

-import com.java2nb.novel.core.utils.HttpUtil;
-import com.java2nb.novel.core.utils.IdWorker;
-import com.java2nb.novel.core.utils.RandomBookInfoUtil;
-import com.java2nb.novel.core.utils.RestTemplateUtil;
+import com.java2nb.novel.core.utils.*;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookContent;
 import com.java2nb.novel.entity.BookIndex;
@ -37,7 +34,7 @@ public class CrawlParser {

    private static RestTemplate restTemplate = RestTemplateUtil.getInstance("utf-8");

-    private static ThreadLocal <Integer> retryCount = new ThreadLocal<>();
+    private static ThreadLocal<Integer> retryCount = new ThreadLocal<>();

    @SneakyThrows
    public static Book parseBook(RuleBean ruleBean, String bookId) {
@ -65,7 +62,7 @@ public class CrawlParser {
                        boolean isFindPicUrl = picUrlMatch.find();
                        if (isFindPicUrl) {
                            String picUrl = picUrlMatch.group(1);
-                            if(StringUtils.isNotBlank(picUrl) && StringUtils.isNotBlank(ruleBean.getPicUrlPrefix())) {
+                            if (StringUtils.isNotBlank(picUrl) && StringUtils.isNotBlank(ruleBean.getPicUrlPrefix())) {
                                picUrl = ruleBean.getPicUrlPrefix() + picUrl;
                            }
                            //设置封面图片路径
@ -96,11 +93,11 @@ public class CrawlParser {
                    String desc = bookDetailHtml.substring(bookDetailHtml.indexOf(ruleBean.getDescStart()) + ruleBean.getDescStart().length());
                    desc = desc.substring(0, desc.indexOf(ruleBean.getDescEnd()));
                    //过滤掉简介中的特殊标签
-                    desc = desc.replaceAll("<a[^<]+</a>","")
-                            .replaceAll("<font[^<]+</font>","")
-                            .replaceAll("<p>\\s*</p>","")
-                            .replaceAll("<p>","")
-                            .replaceAll("</p>","<br/>");
+                    desc = desc.replaceAll("<a[^<]+</a>", "")
+                            .replaceAll("<font[^<]+</font>", "")
+                            .replaceAll("<p>\\s*</p>", "")
+                            .replaceAll("<p>", "")
+                            .replaceAll("</p>", "<br/>");
                    //设置书籍简介
                    book.setBookDesc(desc);
                    if (StringUtils.isNotBlank(ruleBean.getStatusPatten())) {
@ -146,9 +143,9 @@ public class CrawlParser {
    }

    public static Map<Integer, List> parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean, Map<Integer, BookIndex> hasIndexs) {
-        Map<Integer,List> result = new HashMap<>(2);
-        result.put(BOOK_INDEX_LIST_KEY,new ArrayList(0));
-        result.put(BOOK_CONTENT_LIST_KEY,new ArrayList(0));
+        Map<Integer, List> result = new HashMap<>(2);
+        result.put(BOOK_INDEX_LIST_KEY, new ArrayList(0));
+        result.put(BOOK_CONTENT_LIST_KEY, new ArrayList(0));

        Date currentDate = new Date();

@ -159,7 +156,7 @@ public class CrawlParser {
        String indexListHtml = getByHttpClientWithChrome(indexListUrl);

        if (indexListHtml != null) {
-            if(StringUtils.isNotBlank(ruleBean.getBookIndexStart())){
+            if (StringUtils.isNotBlank(ruleBean.getBookIndexStart())) {
                indexListHtml = indexListHtml.substring(indexListHtml.indexOf(ruleBean.getBookIndexStart()) + ruleBean.getBookIndexStart().length());
            }

@ -174,10 +171,7 @@ public class CrawlParser {
            int indexNum = 0;

            //总字数
-            Integer totalWordCount = 0;
-            //最新目录
-            Long lastIndexId = null;
-            String lastIndexName = null;
+            Integer totalWordCount = book.getWordCount() == null ? 0 : book.getWordCount();

            while (isFindIndex) {

@ -189,12 +183,12 @@ public class CrawlParser {
                    String sourceIndexId = indexIdMatch.group(1);
                    String bookContentUrl = ruleBean.getBookContentUrl();
                    int calStart = bookContentUrl.indexOf("{cal_");
-                    if(calStart != -1){
+                    if (calStart != -1) {
                        //内容页URL需要进行计算才能得到
-                        String calStr = bookContentUrl.substring(calStart,calStart+bookContentUrl.substring(calStart).indexOf("}"));
+                        String calStr = bookContentUrl.substring(calStart, calStart + bookContentUrl.substring(calStart).indexOf("}"));
                        String[] calArr = calStr.split("_");
                        int calType = Integer.parseInt(calArr[1]);
-                        if(calType == 1) {
+                        if (calType == 1) {
                            ///{cal_1_1_3}_{bookId}/{indexId}.html
                            //第一种计算规则，去除第x个参数的最后y个字母
                            int x = Integer.parseInt(calArr[2]);
@ -206,12 +200,12 @@ public class CrawlParser {
                                calResult = sourceIndexId.substring(0, sourceBookId.length() - y);
                            }

-                            if(calResult.length() == 0){
+                            if (calResult.length() == 0) {
                                calResult = "0";

                            }

-                            bookContentUrl = bookContentUrl.replace(calStr+"}", calResult);
+                            bookContentUrl = bookContentUrl.replace(calStr + "}", calResult);
                        }

                    }
@ -223,54 +217,43 @@ public class CrawlParser {
                    if (contentHtml != null && !contentHtml.contains("正在手打中")) {
                        String content = contentHtml.substring(contentHtml.indexOf(ruleBean.getContentStart()) + ruleBean.getContentStart().length());
                        content = content.substring(0, content.indexOf(ruleBean.getContentEnd()));
-                        //TODO插入章节目录和章节内容
+                        //插入章节目录和章节内容
                        BookIndex bookIndex = new BookIndex();
-
                        bookIndex.setIndexName(indexName);
                        bookIndex.setIndexNum(indexNum);
+                        Integer wordCount = StringUtil.getStrValidWordCount(content);
+                        bookIndex.setWordCount(wordCount);
                        indexList.add(bookIndex);
-                        BookContent bookContent = new BookContent();

+                        BookContent bookContent = new BookContent();
                        bookContent.setContent(content);
                        contentList.add(bookContent);

-                        //判断是新增还是更新
-                        if(hasIndexs.size() == 0){
-                            //新书入库
+                        if (hasIndex != null) {
+                            //章节更新
+                            bookIndex.setId(hasIndex.getId());
+                            bookContent.setIndexId(hasIndex.getId());
+
+                            //计算总字数
+                            totalWordCount = (totalWordCount+wordCount-hasIndex.getWordCount());
+                        } else {
+                            //章节插入
                            //设置目录和章节内容
                            Long indexId = idWorker.nextId();
-                            lastIndexId = indexId;
-                            lastIndexName = indexName;
                            bookIndex.setId(indexId);
                            bookIndex.setBookId(book.getId());
-                            Integer wordCount = bookContent.getContent().length();
-                            totalWordCount += wordCount;
-                            bookIndex.setWordCount(wordCount);
+
                            bookIndex.setCreateTime(currentDate);
-                            bookIndex.setUpdateTime(currentDate);

                            bookContent.setIndexId(indexId);

-                            //设置小说基础信息
-                            book.setWordCount(totalWordCount);
-                            book.setLastIndexId(lastIndexId);
-                            book.setLastIndexName(lastIndexName);
-                            book.setLastIndexUpdateTime(currentDate);
-                            book.setCreateTime(currentDate);
-                            book.setUpdateTime(currentDate);
-
-                        }else{
-                            //老书更新
+                            //计算总字数
+                            totalWordCount += wordCount;
                        }
+                        bookIndex.setUpdateTime(currentDate);



-                        if(hasIndex != null){
-                            bookIndex.setId(hasIndex.getId());
-                            bookContent.setIndexId(hasIndex.getId());
-                        }
-
-
                    }


@ -279,15 +262,29 @@ public class CrawlParser {
                isFindIndex = indexIdMatch.find() & indexNameMatch.find();
            }

+
+            if (indexList.size() > 0) {
+                //如果有爬到最新章节，则设置小说主表的最新章节信息
+                //获取爬取到的最新章节
+                BookIndex lastIndex = indexList.get(indexList.size()-1);
+                book.setLastIndexId(lastIndex.getId());
+                book.setLastIndexName(lastIndex.getIndexName());
+                book.setLastIndexUpdateTime(currentDate);
+
+            }
+            book.setWordCount(totalWordCount);
+            book.setUpdateTime(currentDate);
+
            if (indexList.size() == contentList.size() && indexList.size() > 0) {

-                result.put(BOOK_INDEX_LIST_KEY,indexList);
-                result.put(BOOK_CONTENT_LIST_KEY,contentList);
+                result.put(BOOK_INDEX_LIST_KEY, indexList);
+                result.put(BOOK_CONTENT_LIST_KEY, contentList);

            }

        }

+
        return result;
    }

@ -297,7 +294,7 @@ public class CrawlParser {
            ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
            if (forEntity.getStatusCode() == HttpStatus.OK) {
                String body = forEntity.getBody();
-                if(body.length() < Constants.INVALID_HTML_LENGTH){
+                if (body.length() < Constants.INVALID_HTML_LENGTH) {
                    return processErrorHttpResult(url);
                }
                //成功获得html内容
@ -314,11 +311,11 @@ public class CrawlParser {
        try {

            String body = HttpUtil.getByHttpClientWithChrome(url);
-                if(body != null && body.length() < Constants.INVALID_HTML_LENGTH){
-                    return processErrorHttpResult(url);
-                }
-                //成功获得html内容
-                return body;
+            if (body != null && body.length() < Constants.INVALID_HTML_LENGTH) {
+                return processErrorHttpResult(url);
+            }
+            //成功获得html内容
+            return body;
        } catch (Exception e) {
            e.printStackTrace();
        }
@ -327,13 +324,13 @@ public class CrawlParser {
    }

    @SneakyThrows
-    private static String processErrorHttpResult(String url){
+    private static String processErrorHttpResult(String url) {
        Integer count = retryCount.get();
-        if(count == null){
+        if (count == null) {
            count = 0;
        }
-        if(count < Constants.HTTP_FAIL_RETRY_COUNT){
-            Thread.sleep(  new Random().nextInt(10*1000));
+        if (count < Constants.HTTP_FAIL_RETRY_COUNT) {
+            Thread.sleep(new Random().nextInt(10 * 1000));
            retryCount.set(++count);
            return getByHttpClient(url);
        }
--- a/novel-crawl/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
@ -58,6 +58,7 @@ public class StarterListener implements ServletContextListener {
                                Book book = CrawlParser.parseBook(ruleBean, needUpdateBook.getCrawlBookId());
                                //这里只做老书更新
                                book.setId(needUpdateBook.getId());
+                                book.setWordCount(needUpdateBook.getWordCount());
                                if (needUpdateBook.getPicUrl() != null && needUpdateBook.getPicUrl().contains(Constants.LOCAL_PIC_PREFIX)) {
                                    //本地图片则不更新
                                    book.setPicUrl(null);
--- a/novel-crawl/src/main/java/com/java2nb/novel/service/BookService.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/service/BookService.java
@ -65,9 +65,8 @@ public interface BookService {
     * @param book 小说数据
     * @param bookIndexList 目录集合
     * @param bookContentList 内容集合
-     * @param existBookIndexMap  已存在的章节Map
-     * */
-    void updateBookAndIndexAndContent(Book book, List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap);
+     * @param existBookIndexMap  已存在的章节Map   */
+    void updateBookAndIndexAndContent(Book book,  List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap);

    /**
     * 更新一下最后一次的抓取时间
--- a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
@ -1,6 +1,5 @@
 package com.java2nb.novel.service.impl;

-import com.java2nb.novel.core.utils.IdWorker;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookContent;
 import com.java2nb.novel.entity.BookIndex;
@ -79,12 +78,9 @@ public class BookServiceImpl implements BookService {

            if(bookIndexList.size()>0) {

-                if (book.getId() == null) {
-                    book.setId(new IdWorker().nextId());
-                }
-
                //保存小说主表

+                book.setCreateTime(new Date());
                bookMapper.insertSelective(book);

                //批量保存目录和内容
@ -109,7 +105,7 @@ public class BookServiceImpl implements BookService {

    @Override
    public Map<Integer, BookIndex> queryExistBookIndexMap(Long bookId) {
-        List<BookIndex> bookIndexs = bookIndexMapper.selectMany(select(BookIndexDynamicSqlSupport.id,BookIndexDynamicSqlSupport.indexNum,BookIndexDynamicSqlSupport.indexName)
+        List<BookIndex> bookIndexs = bookIndexMapper.selectMany(select(BookIndexDynamicSqlSupport.id,BookIndexDynamicSqlSupport.indexNum,BookIndexDynamicSqlSupport.indexName,BookIndexDynamicSqlSupport.wordCount)
                .from(BookIndexDynamicSqlSupport.bookIndex)
                .where(BookIndexDynamicSqlSupport.bookId,isEqualTo(bookId))
                .build()
@ -122,36 +118,19 @@ public class BookServiceImpl implements BookService {

    @Transactional(rollbackFor = Exception.class)
    @Override
-    public void updateBookAndIndexAndContent(Book book, List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap) {
-        Date currentDate = new Date();
+    public void updateBookAndIndexAndContent(Book book,  List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap) {
        for (int i = 0; i < bookIndexList.size(); i++) {
            BookIndex bookIndex = bookIndexList.get(i);
            BookContent bookContent = bookContentList.get(i);

-            //插入或更新目录
-            Integer wordCount = bookContent.getContent().length();
-            bookIndex.setWordCount(wordCount);
-            bookIndex.setUpdateTime(currentDate);

-            if(bookIndex.getId() == null) {
+            if(!existBookIndexMap.containsKey(bookIndex.getIndexNum())) {
                //插入
-                bookIndex.setBookId(book.getId());
-                Long indexId = new IdWorker().nextId();
-                bookIndex.setId(indexId);
-                bookIndex.setCreateTime(currentDate);
                bookIndexMapper.insertSelective(bookIndex);
-            }else{
-                //更新
-                bookIndexMapper.updateByPrimaryKeySelective(bookIndex);
-            }
-
-            if(bookContent.getIndexId() == null) {
-                //插入
-                bookContent.setIndexId(bookIndex.getId());
                bookContentMapper.insertSelective(bookContent);
            }else{
                //更新
-
+                bookIndexMapper.updateByPrimaryKeySelective(bookIndex);
                bookContentMapper.update(update(BookContentDynamicSqlSupport.bookContent)
                        .set(BookContentDynamicSqlSupport.content)
                        .equalTo(bookContent.getContent())
@ -160,21 +139,10 @@ public class BookServiceImpl implements BookService {
                        .render(RenderingStrategies.MYBATIS3));
            }

+
        }

        //更新小说主表
-        if(bookIndexList.size()>0) {
-            //有更新章节，才需要更新以下字段
-            book.setWordCount(queryTotalWordCount(book.getId()));
-            BookIndex lastIndex = bookIndexList.get(bookIndexList.size()-1);
-            if(!existBookIndexMap.containsKey(lastIndex.getIndexNum())) {
-                //如果最新章节不在已存在章节中，那么更新小说表最新章节信息
-                book.setLastIndexId(lastIndex.getId());
-                book.setLastIndexName(lastIndex.getIndexName());
-                book.setLastIndexUpdateTime(currentDate);
-            }
-        }
-        book.setUpdateTime(currentDate);
        book.setBookName(null);
        book.setAuthorName(null);
        if(Constants.VISIT_COUNT_DEFAULT.equals(book.getVisitCount())) {
--- a/novel-crawl/src/main/resources/mybatis/mapping/BookMapper.xml
+++ b/novel-crawl/src/main/resources/mybatis/mapping/BookMapper.xml
@ -5,7 +5,7 @@

    <select id="queryNeedUpdateBook" resultType="com.java2nb.novel.entity.Book">

-        select id,crawl_source_id,crawl_book_id,crawl_last_time,pic_url
+        select id,crawl_source_id,crawl_book_id,crawl_last_time,pic_url,word_count
        from book where last_index_update_time > #{startDate} and crawl_source_id is not null
        order by crawl_last_time
        limit ${limit}
@ -15,8 +15,7 @@

    <select id="queryTotalWordCount" parameterType="long" resultType="int">

-        select sum(t2.word_count) from book t1 inner join book_index t2
-        on t1.id = t2.book_id and t1.id = #{bookId}
+        select sum(word_count) from book_index where book_id = #{bookId}
    </select>

    <update id="updateCrawlLastTime">
--- a/novel-front/pom.xml
+++ b/novel-front/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>novel</artifactId>
        <groupId>com.java2nb</groupId>
-        <version>3.1.0</version>
+        <version>3.3.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/novel-front/src/main/java/com/java2nb/novel/FrontNovelApplication.java
+++ b/novel-front/src/main/java/com/java2nb/novel/FrontNovelApplication.java
@ -5,6 +5,7 @@ import io.shardingsphere.shardingjdbc.spring.boot.SpringBootConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement
@EnableScheduling
@EnableCaching
+@ServletComponentScan
@MapperScan(basePackages = {"com.java2nb.novel.mapper"})
@Import(FdfsClientConfig.class)
 public class FrontNovelApplication {
--- a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
@ -6,15 +6,16 @@ import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.utils.RandomValidateCodeUtil;
+import com.java2nb.novel.core.valid.AddGroup;
+import com.java2nb.novel.core.valid.UpdateGroup;
 import com.java2nb.novel.entity.User;
 import com.java2nb.novel.entity.UserBuyRecord;
-import com.java2nb.novel.form.UserForm;
 import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.service.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import javax.servlet.http.HttpServletRequest;
@ -42,12 +43,7 @@ public class UserController extends BaseController {
     * 登陆
     */
    @PostMapping("login")
-    public ResultBean login(@Valid UserForm user, BindingResult result) {
-        //判断参数是否合法
-        if (result.hasErrors()) {
-            log.info(result.getAllErrors().toString());
-            return ResultBean.fail(ResponseStatus.PARAM_ERROR);
-        }
+    public ResultBean login(User user) {

        //登陆
        UserDetails userDetails = userService.login(user);
@ -64,13 +60,8 @@ public class UserController extends BaseController {
     * 注册
     */
    @PostMapping("register")
-    public ResultBean register(@Valid UserForm user, @RequestParam(value = "velCode", defaultValue = "") String velCode, BindingResult result) {
+    public ResultBean register(@Validated({AddGroup.class}) User user, @RequestParam(value = "velCode", defaultValue = "") String velCode) {

-        //判断参数是否合法
-        if (result.hasErrors()) {
-            log.info(result.getAllErrors().toString());
-            return ResultBean.fail(ResponseStatus.PARAM_ERROR);
-        }

        //判断验证码是否正确
        if (!velCode.equals(cacheService.get(RandomValidateCodeUtil.RANDOM_CODE_KEY))) {
@ -225,7 +216,7 @@ public class UserController extends BaseController {
     * 更新个人信息
     * */
    @PostMapping("updateUserInfo")
-    public ResultBean updateUserInfo(User user,HttpServletRequest request) {
+    public ResultBean updateUserInfo(@Validated({UpdateGroup.class}) User user, HttpServletRequest request) {
        UserDetails userDetails = getUserDetails(request);
        if (userDetails == null) {
            return ResultBean.fail(ResponseStatus.NO_LOGIN);
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/ErrorPageConfig.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/ErrorPageConfig.java
@ -0,0 +1,25 @@
+package com.java2nb.novel.core.config;
+
+import org.springframework.boot.web.server.ErrorPage;
+import org.springframework.boot.web.server.ErrorPageRegistrar;
+import org.springframework.boot.web.server.ErrorPageRegistry;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+
+/**
+ * 错误页面配置
+ * @author xiongxiaoyang
+ */
+@Configuration
+public class ErrorPageConfig implements ErrorPageRegistrar {
+
+    @Override
+    public void registerErrorPages(ErrorPageRegistry registry) {
+        /*1.错误类型为404，默认显示404.html网页*/
+        ErrorPage e404 = new ErrorPage(HttpStatus.NOT_FOUND, "/404.html");
+        /**
+        TODO 2.错误类型为500，表示服务器响应错误，默认显示/500.html网页
+        */
+        registry.addErrorPages(e404);
+    }
+}
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/WebsiteConfig.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/WebsiteConfig.java
@ -0,0 +1,20 @@
+package com.java2nb.novel.core.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author 11797
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix="website")
+public class WebsiteConfig {
+
+    private String name;
+    private String domain;
+    private String keyword;
+    private String description;
+    private String qq;
+}
--- a/novel-front/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
@ -0,0 +1,28 @@
+package com.java2nb.novel.core.listener;
+
+import com.java2nb.novel.core.config.WebsiteConfig;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+/**
+ * 启动监听器
+ * @author xiongxiaoyang
+ */
+@WebListener
+@Slf4j
+@RequiredArgsConstructor
+public class StarterListener implements ServletContextListener {
+
+    private final WebsiteConfig websiteConfig;
+
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+        sce.getServletContext().setAttribute("website",websiteConfig);
+
+    }
+}
--- a/novel-front/src/main/java/com/java2nb/novel/core/utils/JwtTokenUtil.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/utils/JwtTokenUtil.java
@ -86,7 +86,11 @@ public class JwtTokenUtil {
     */
    private boolean isTokenExpired(String token) {
        Date expiredDate = getExpiredDateFromToken(token);
-        return expiredDate.before(new Date());
+        if(expiredDate == null){
+            return true;
+        }else {
+            return expiredDate.before(new Date());
+        }
    }

    /**
@ -94,7 +98,7 @@ public class JwtTokenUtil {
     */
    private Date getExpiredDateFromToken(String token) {
        Claims claims = getClaimsFromToken(token);
-        return claims.getExpiration();
+        return claims != null ? claims.getExpiration() : null;
    }

    /**
--- a/novel-front/src/main/java/com/java2nb/novel/form/UserForm.java
+++ b/novel-front/src/main/java/com/java2nb/novel/form/UserForm.java
@ -1,20 +0,0 @@
-package com.java2nb.novel.form;
-
-import lombok.Data;
-
-import javax.annotation.Generated;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-
-@Data
-public class UserForm {
-    @NotBlank(message="手机号不能为空！")
-    @Pattern(regexp="^1[3|4|5|6|7|8|9][0-9]{9}$",message="手机号格式不正确！")
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private String username;
-
-    @NotBlank(message="密码不能为空！")
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private String password;
-
-}
--- a/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
@ -1,6 +1,6 @@
-package com.java2nb.novel.controller;
+package com.java2nb.novel.page;

-import com.java2nb.novel.core.bean.ResultBean;
+import com.java2nb.novel.controller.BaseController;
 import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.utils.ThreadLocalUtil;
 import com.java2nb.novel.entity.*;
@ -9,16 +9,16 @@ import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.service.NewsService;
 import com.java2nb.novel.service.UserService;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

 import javax.servlet.http.HttpServletRequest;
-import java.net.URLEncoder;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;

 /**
@ -27,7 +27,7 @@ import java.util.List;
@Slf4j
@RequiredArgsConstructor
@Controller
-public class PageController extends BaseController{
+public class PageController extends BaseController {

    private final BookService bookService;

@ -97,6 +97,7 @@ public class PageController extends BaseController{
    /**
     * 详情页
     * */
+    @SneakyThrows
    @RequestMapping("/book/{bookId}.html")
    public String bookDetail(@PathVariable("bookId") Long bookId, Model model) {
        Book book = bookService.queryBookDetail(bookId);
@ -112,6 +113,7 @@ public class PageController extends BaseController{
    /**
     * 目录页
     * */
+    @SneakyThrows
    @RequestMapping("/book/indexList-{bookId}.html")
    public String indexList(@PathVariable("bookId") Long bookId, Model model) {
        Book book = bookService.queryBookDetail(bookId);
@ -125,13 +127,14 @@ public class PageController extends BaseController{
    /**
     * 内容页
     * */
+    @SneakyThrows
    @RequestMapping("/book/{bookId}/{bookIndexId}.html")
-    public String indexList(@PathVariable("bookId") Long bookId,@PathVariable("bookIndexId") Long bookIndexId, HttpServletRequest request,Model model) {
+    public String indexList(@PathVariable("bookId") Long bookId,@PathVariable("bookIndexId") Long bookIndexId, HttpServletRequest request, Model model) {
        //查询书籍
        Book book = bookService.queryBookDetail(bookId);
-        model.addAttribute("book",book);
        //查询目录
        BookIndex bookIndex = bookService.queryBookIndex(bookIndexId);
+        model.addAttribute("book",book);
        model.addAttribute("bookIndex",bookIndex);
        //查询上一章节目录ID
        Long preBookIndexId = bookService.queryPreBookIndexId(bookId,bookIndex.getIndexNum());
--- a/novel-front/src/main/java/com/java2nb/novel/service/UserService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/UserService.java
@ -3,7 +3,6 @@ package com.java2nb.novel.service;

 import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.entity.UserBuyRecord;
-import com.java2nb.novel.form.UserForm;
 import com.java2nb.novel.vo.BookReadHistoryVO;
 import com.java2nb.novel.vo.BookShelfVO;
 import com.java2nb.novel.entity.User;
@ -19,17 +18,17 @@ public interface UserService {

    /**
     * 用户注册
-     * @param form 用户注册提交信息类
+     * @param user 用户注册信息类
     * @return jwt载体信息类
     * */
-    UserDetails register(UserForm form);
+    UserDetails register(User user);

    /**
     * 用户登陆
-     * @param form 用户登陆提交信息类
+     * @param user 用户登陆信息类
     * @return jwt载体信息类
     * */
-    UserDetails login(UserForm form);
+    UserDetails login(User user);

    /**
     * 查询小说是否已加入书架
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java
@ -35,7 +35,7 @@ public class NewsServiceImpl implements NewsService {
    public List<News> listIndexNews() {
        List<News> result = (List<News>) cacheService.getObject(CacheKey.INDEX_NEWS_KEY);
        if(result == null || result.size() == 0) {
-            SelectStatementProvider selectStatement = select(id, catName, catId, title)
+            SelectStatementProvider selectStatement = select(id, catName, catId, title,createTime)
                    .from(news)
                    .orderBy(createTime.descending())
                    .limit(2)
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
@ -5,7 +5,6 @@ import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.utils.BeanUtil;
 import com.java2nb.novel.entity.*;
 import com.java2nb.novel.entity.User;
-import com.java2nb.novel.form.UserForm;
 import com.java2nb.novel.service.UserService;
 import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.exception.BusinessException;
@ -29,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 import java.util.List;

-import static com.java2nb.novel.mapper.BookDynamicSqlSupport.book;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.id;
 import static com.java2nb.novel.mapper.UserBookshelfDynamicSqlSupport.userBookshelf;
 import static com.java2nb.novel.mapper.UserDynamicSqlSupport.*;
@ -59,11 +57,11 @@ public class UserServiceImpl implements UserService {


    @Override
-    public UserDetails register(UserForm form) {
+    public UserDetails register(User user) {
        //查询用户名是否已注册
        SelectStatementProvider selectStatement = select(count(id))
-                .from(user)
-                .where(username, isEqualTo(form.getUsername()))
+                .from(UserDynamicSqlSupport.user)
+                .where(username, isEqualTo(user.getUsername()))
                .build()
                .render(RenderingStrategies.MYBATIS3);
        long count = userMapper.count(selectStatement);
@ -72,7 +70,7 @@ public class UserServiceImpl implements UserService {
            throw new BusinessException(ResponseStatus.USERNAME_EXIST);
        }
        User entity = new User();
-        BeanUtils.copyProperties(form,entity);
+        BeanUtils.copyProperties(user,entity);
        //数据库生成注册记录
        Long id = new IdWorker().nextId();
        entity.setId(id);
@ -91,12 +89,12 @@ public class UserServiceImpl implements UserService {
    }

    @Override
-    public UserDetails login(UserForm form) {
+    public UserDetails login(User user) {
        //根据用户名密码查询记录
        SelectStatementProvider selectStatement = select(id, username,nickName)
-                .from(user)
-                .where(username, isEqualTo(form.getUsername()))
-                .and(password, isEqualTo(MD5Util.MD5Encode(form.getPassword(), Charsets.UTF_8.name())))
+                .from(UserDynamicSqlSupport.user)
+                .where(username, isEqualTo(user.getUsername()))
+                .and(password, isEqualTo(MD5Util.MD5Encode(user.getPassword(), Charsets.UTF_8.name())))
                .build()
                .render(RenderingStrategies.MYBATIS3);
        List<User> users = userMapper.selectMany(selectStatement);
@ -105,10 +103,10 @@ public class UserServiceImpl implements UserService {
        }
        //生成UserDetail对象并返回
        UserDetails userDetails = new UserDetails();
-        User user = users.get(0);
+        user = users.get(0);
        userDetails.setId(user.getId());
        userDetails.setNickName(user.getNickName());
-        userDetails.setUsername(form.getUsername());
+        userDetails.setUsername(user.getUsername());
        return userDetails;
    }

@ -232,12 +230,9 @@ public class UserServiceImpl implements UserService {

    @Override
    public void updateUserInfo(Long userId, User user) {
-        User updateUser = new User();
-        updateUser.setId(userId);
-        updateUser.setNickName(user.getNickName());
-        updateUser.setUserSex(user.getUserSex());
-        updateUser.setUpdateTime(new Date());
-        userMapper.updateByPrimaryKeySelective(updateUser);
+        user.setId(userId);
+        user.setUpdateTime(new Date());
+        userMapper.updateByPrimaryKeySelective(user);

    }

--- a/novel-front/src/main/java/com/java2nb/novel/vo/BookSettingVO.java
+++ b/novel-front/src/main/java/com/java2nb/novel/vo/BookSettingVO.java
@ -21,6 +21,12 @@ public class BookSettingVO extends BookSetting implements Serializable {

    private Float score;

+    private Integer catId;
+
+    private String catName;
+
+    private Byte bookStatus;
+

    @Override
    public String toString() {
--- a/novel-front/src/main/resources/application-website.yml
+++ b/novel-front/src/main/resources/application-website.yml
@ -0,0 +1,12 @@
+#网站配置
+website:
+  #网站名
+  name: 小说精品屋
+  #域名
+  domain: xiongxyang.gitee.io/home
+  #SEO关键词
+  keyword: ${website.name},小说,小说CMS,原创文学系统,开源小说系统,免费小说建站程序
+  #SEO描述
+  description: ${website.name}是一个多端（PC、WAP）阅读、功能完善的原创文学CMS系统，由前台门户系统、作家后台管理系统、平台后台管理系统、爬虫管理系统等多个子系统构成，支持会员充值、订阅模式、新闻发布和实时统计报表等功能，新书自动入库，老书自动更新。
+  #联系QQ
+  qq: 1179705413
--- a/novel-front/src/main/resources/application.yml
+++ b/novel-front/src/main/resources/application.yml
@ -4,7 +4,7 @@ server:
 spring:
  profiles:
    active: dev
-    include: alipay,oss,fastdfs
+    include: website,alipay,oss,fastdfs


  rabbitmq:
@ -25,6 +25,14 @@ spring:
    jest:
      uris: http://127.0.0.1:9200

+  #thymeleaf模版路径配置
+  thymeleaf:
+    prefix: file:${user.dir}/templates/${templates.name}/html/
+    suffix: .html
+  #静态文件路径配置
+  resources:
+    static-locations: file:${user.dir}/templates/${templates.name}/static/
+
 redisson:
  singleServerConfig:
    address: 127.0.0.1:6379
@ -64,4 +72,14 @@ book:
    #字数
    word-count: 1000
    #价值(屋币)
-    value: 5
+    value: 5
+
+
+
+#模版配置
+templates:
+  name: orange
+
+
+
+
--- a/novel-front/src/main/resources/messages.properties
+++ b/novel-front/src/main/resources/messages.properties
@ -1,5 +0,0 @@
-#网站配置
-#网站名
-website.name=小说精品屋
-#PC站网站域名
-website.domain=www.java2nb.com
--- a/novel-front/src/main/resources/mybatis/mapping/BookSettingMapper.xml
+++ b/novel-front/src/main/resources/mybatis/mapping/BookSettingMapper.xml
@ -4,7 +4,7 @@
 <mapper namespace="com.java2nb.novel.mapper.FrontBookSettingMapper">
    
    <select id="listVO" resultType="com.java2nb.novel.vo.BookSettingVO">
-        select t1.book_id,t1.type,t1.sort,t2.book_name,t2.author_name,t2.pic_url,t2.book_desc,t2.score
+        select t1.book_id,t1.type,t1.sort,t2.book_name,t2.author_name,t2.pic_url,t2.book_desc,t2.score,t2.cat_id,t2.cat_name,t2.book_status
        from book_setting t1 inner join book t2
        on t1.book_id = t2.id
        order by t1.sort
--- a/novel-front/src/main/resources/static/images/404.jpeg
+++ b/novel-front/src/main/resources/static/images/404.jpeg
--- a/novel-front/src/main/resources/templates/404.html
+++ b/novel-front/src/main/resources/templates/404.html
@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Page Not Found</title>
+    <script>
+        setTimeout(function () {
+            location.href = '/';
+        },3000)
+
+    </script>
+</head>
+<body style="background: url(/images/404.jpeg) no-repeat;" >
+
+
+</body>
+</html>
--- a/novel-front/src/main/resources/templates/about/contact.html
+++ b/novel-front/src/main/resources/templates/about/contact.html
@ -3,9 +3,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'联系我们_'+#{website.name}"></title>
+    <title th:text="'联系我们_'+${application.website.name}"></title>
    <meta name="keywords" content="联系我们,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
-    <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />
+    <meta name="description" th:content="${application.website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'" />
    <link rel="stylesheet" href="/css/about.css"/>
 </head>
 <body class="body">
@ -30,8 +30,8 @@
            <div class="aboutBox">
                <h2>联系我们</h2>
                <div class="about_info">
-                    <A href="tencent://message/?uin=1179705413&amp;Site=作家申请,商务合作&amp;Menu=yes">
-                        <img style="border:0px;" src=http://wpa.qq.com/pa?p=1:1179705413:6></a>
+                    <A th:href="'tencent://message/?uin='+${application.website.qq}+'&amp;Site=作家申请,商务合作&amp;Menu=yes'">
+                        <img style="border:0px;" th:src="'http://wpa.qq.com/pa?p=1:'+${application.website.qq}+':6'"></a>
                    <p>&nbsp;</p>
                    <p>&nbsp;</p>
                </div>
--- a/novel-front/src/main/resources/templates/about/copyright.html
+++ b/novel-front/src/main/resources/templates/about/copyright.html
@ -3,9 +3,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'版权声明_'+#{website.name}"></title>
+    <title th:text="'版权声明_'+${application.website.name}"></title>
    <meta name="keywords" content="版权声明,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
-    <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />
+    <meta name="description" th:content="${application.website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'" />
    <link rel="stylesheet" href="/css/about.css"/>
 </head>
 <body class="body">
--- a/novel-front/src/main/resources/templates/about/default.html
+++ b/novel-front/src/main/resources/templates/about/default.html
@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'关于我们_'+#{website.name}"></title>
+    <title th:text="'关于我们_'+${application.website.name}"></title>
    <meta name="keywords" content="关于我们,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
-    <meta name="description" th:content="#{website.name}+'每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />
+    <meta name="description" th:content="${application.website.name}+'每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'" />
    <link rel="stylesheet" href="/css/about.css"/>
 </head>
 <body class="body">
@ -27,7 +27,7 @@
            <div class="aboutBox">
                <h2>关于我们</h2>
                <div class="about_info">
-                    <p th:text="#{website.name}+'创建于2019年，是集创作、阅读、作品加工、IP运营为一体的中文小说阅读综合平台。'"></p>
+                    <p th:text="${application.website.name}+'创建于2019年，是集创作、阅读、作品加工、IP运营为一体的中文小说阅读综合平台。'"></p>
                    <p></p>
                </div>
            </div>
--- a/novel-front/src/main/resources/templates/about/news.html
+++ b/novel-front/src/main/resources/templates/about/news.html
@ -2,10 +2,10 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'新闻公共_'+#{website.name}"></title>
+    <title th:text="'新闻公共_'+${application.website.name}"></title>
    <meta name="keywords" content="新闻公告,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学"/>
    <meta name="description"
-          th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'"/>
+          th:content="${application.website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'"/>
    <link rel="stylesheet" href="/css/about.css"/>
 </head>
 <body class="body">
--- a/novel-front/src/main/resources/templates/about/news_info.html
+++ b/novel-front/src/main/resources/templates/about/news_info.html
@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'新闻公告_'+#{website.name}"></title>
+    <title th:text="'新闻公告_'+${application.website.name}"></title>
    <meta name="keywords" content="新闻公告,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学"/>
-    <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />
+    <meta name="description" th:content="${application.website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'" />
    <link rel="stylesheet" href="/css/about.css" />
 </head>
 <body class="body">
--- a/novel-front/src/main/resources/templates/about/submission.html
+++ b/novel-front/src/main/resources/templates/about/submission.html
@ -3,9 +3,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'投稿说明_'+#{website.name}"></title>
+    <title th:text="'投稿说明_'+${application.website.name}"></title>
    <meta name="keywords" content="投稿说明,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
-    <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />
+    <meta name="description" th:content="${application.website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'" />
    <link rel="stylesheet" href="/css/about.css"/>
 </head>
 <body class="body">
--- a/novel-front/src/main/resources/templates/about/user_agreement.html
+++ b/novel-front/src/main/resources/templates/about/user_agreement.html
@ -3,9 +3,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'用户协议_'+#{website.name}"></title>
+    <title th:text="'用户协议_'+${application.website.name}"></title>
    <meta name="keywords" content="用户协议,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
-    <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />
+    <meta name="description" th:content="${application.website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'" />
    <link rel="stylesheet" href="/css/about.css"/>
 </head>
 <body class="body">
--- a/novel-front/src/main/resources/templates/book/book_comment.html
+++ b/novel-front/src/main/resources/templates/book/book_comment.html
@ -3,9 +3,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="${book.bookName}+'作品评论区_'+#{website.name}"></title>
+    <title th:text="${book.bookName}+'作品评论区_'+${application.website.name}"></title>
    <meta name="keywords" th:content="${book.bookName}+'官方首发,'+${book.bookName}+'小说,'+${book.bookName}+'最新章节,'+${book.bookName}+'txt下载,'+${book.bookName}+'无弹窗,'+${book.bookName}+'吧,'+${book.bookName}+'离线完本'" />
-    <meta name="description" th:content="${book.bookName}+','+${book.bookName}+'小说阅读,'+#{website.name}+'提供'+${book.bookName}+'首发最新章节及txt下载,'+${book.bookName}+'最新更新章节,精彩尽在'+#{website.name}+'。'" />
+    <meta name="description" th:content="${book.bookName}+','+${book.bookName}+'小说阅读,'+${application.website.name}+'提供'+${book.bookName}+'首发最新章节及txt下载,'+${book.bookName}+'最新更新章节,精彩尽在'+${application.website.name}+'。'" />
    <link href="/css/main.css" rel="stylesheet" />
    <link href="/css/book.css" rel="stylesheet" />
 </head>
--- a/novel-front/src/main/resources/templates/book/book_content.html
+++ b/novel-front/src/main/resources/templates/book/book_content.html
@ -2,9 +2,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:utext="${book.bookName}+'_'+${bookIndex.indexName}+'_'+#{website.name}"></title>
+    <title th:utext="${book.bookName}+'_'+${bookIndex.indexName}+'_'+${application.website.name}"></title>
    <meta name="keywords" th:content="${book.bookName}+'官方首发,'+${book.bookName}+'小说,'+${book.bookName}+'最新章节,'+${book.bookName}+'txt下载,'+${book.bookName}+'无弹窗,'+${book.bookName}+'吧,'+${book.bookName}+'离线完本'" />
-    <meta name="description" th:content="${book.bookName}+','+${book.bookName}+'小说阅读,'+#{website.name}+'提供'+${book.bookName}+'首发最新章节及txt下载,'+${book.bookName}+'最新更新章节,精彩尽在'+#{website.name}+'。'" />
+    <meta name="description" th:content="${book.bookName}+','+${book.bookName}+'小说阅读,'+${application.website.name}+'提供'+${book.bookName}+'首发最新章节及txt下载,'+${book.bookName}+'最新更新章节,精彩尽在'+${application.website.name}+'。'" />
    <link rel="stylesheet" href="/css/read.css" />
    <link href="/css/book.css" rel="stylesheet" />

--- a/novel-front/src/main/resources/templates/book/book_detail.html
+++ b/novel-front/src/main/resources/templates/book/book_detail.html
@ -2,11 +2,11 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:utext="${book.bookName}+'_'+${book.authorName}+'_'+${book.bookName}+'txt下载'+'_'+${book.bookName}+'无弹窗_'+#{website.name}"></title>
+    <title th:utext="${book.bookName}+'_'+${book.authorName}+'_'+${book.bookName}+'txt下载'+'_'+${book.bookName}+'无弹窗_'+${application.website.name}"></title>
    <meta name="keywords"
          th:content="${book.bookName}+'官方首发,'+${book.bookName}+'小说,'+${book.bookName}+'最新章节'+${book.bookName}+'txt下载,'+${book.bookName}+'无弹窗,'+${book.bookName}+'吧,'+${book.bookName}+'离线完本'"/>
    <meta name="description"
-          th:content="${book.bookName}+','+${book.bookName}+'小说阅读,'+${book.bookName}+'由作家'+${book.authorName}+'创作,'+#{website.name}+'提供'+${book.bookName}+'首发最新章节及txt下载,'+${book.bookName}+'最新更新章节,精彩尽在'+#{website.name}+'。'"/>
+          th:content="${book.bookName}+','+${book.bookName}+'小说阅读,'+${book.bookName}+'由作家'+${book.authorName}+'创作,'+${application.website.name}+'提供'+${book.bookName}+'首发最新章节及txt下载,'+${book.bookName}+'最新更新章节,精彩尽在'+${application.website.name}+'。'"/>
    <link rel="stylesheet" href="/css/main.css"/>
    <link href="/css/book.css?v=2019" rel="stylesheet"/>
 </head>
@ -22,7 +22,7 @@

 <div class="main box_center cf mb50">
    <div class="nav_sub">
-        <a href="/" th:text="#{website.name}"></a>&gt;<a th:href="'/book/bookclass.html?c='+${book.catId}" th:text="${book.catName}"></a>&gt;<a
+        <a href="/" th:text="${application.website.name}"></a>&gt;<a th:href="'/book/bookclass.html?c='+${book.catId}" th:text="${book.catName}"></a>&gt;<a
            th:href="'/book/'+${book.id}+'.html'" th:utext="${book.bookName}"></a>
    </div>
    <div class="channelWrap channelBookInfo cf">
--- a/novel-front/src/main/resources/templates/book/book_index.html
+++ b/novel-front/src/main/resources/templates/book/book_index.html
@ -2,10 +2,10 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:utext="${book.bookName}+'目录,'+${book.bookName}+'最新章节列表_'+#{website.name}"></title>
+    <title th:utext="${book.bookName}+'目录,'+${book.bookName}+'最新章节列表_'+${application.website.name}"></title>
    <meta name="keywords" th:content="${book.bookName}+','+${book.bookName}+'目录,'+${book.bookName}+'最新章节列表'"/>
    <meta name="description"
-          th:content="#{website.name}+'小说为您提供'+${book.bookName}+'目录,'+${book.bookName}+'最新章节列表,'+${book.bookName}+'全文阅读,'+${book.bookName}+'免费阅读,'+${book.bookName}+'下载'"/>
+          th:content="${application.website.name}+'小说为您提供'+${book.bookName}+'目录,'+${book.bookName}+'最新章节列表,'+${book.bookName}+'全文阅读,'+${book.bookName}+'免费阅读,'+${book.bookName}+'下载'"/>
    <link rel="stylesheet" href="/css/main.css"/>
    <link rel="stylesheet" href="/css/book.css"/>
 </head>
@ -16,7 +16,7 @@

 <div class="main box_center cf">
    <div class="nav_sub">
-        <a href="/" th:text="#{website.name}"></a>&gt;<a th:href="'/book/bookclass.html?c='+${book.catId}" th:text="${book.catName}"></a>&gt;<a
+        <a href="/" th:text="${application.website.name}"></a>&gt;<a th:href="'/book/bookclass.html?c='+${book.catId}" th:text="${book.catName}"></a>&gt;<a
            th:href="'/book/'+${book.id}+'.html'" th:utext="${book.bookName}"></a>&gt;<a
            th:href="'/book/indexList-'+${book.id}+'.html'">作品目录</a>
    </div>
--- a/novel-front/src/main/resources/templates/book/book_ranking.html
+++ b/novel-front/src/main/resources/templates/book/book_ranking.html
@ -3,9 +3,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'小说排行榜_'+#{website.name}"></title>
+    <title th:text="'小说排行榜_'+${application.website.name}"></title>
    <meta name="keywords" content="小说排行榜,热门小说榜,小说排行榜完结版,完结小说排行榜,完本小说排行榜,最新小说排行榜,网络小说排行榜,排行榜,点击榜,新书榜,推荐榜" />
-    <meta name="description" th:content="'最新热门网络小说排行榜,包含各类热门小说榜,小说排行榜上都是受用户喜爱的小说作品,精彩尽在'+#{website.name}+'。'" />
+    <meta name="description" th:content="'最新热门网络小说排行榜,包含各类热门小说榜,小说排行榜上都是受用户喜爱的小说作品,精彩尽在'+${application.website.name}+'。'" />
    <link rel="stylesheet" href="/css/main.css" />
    <link rel="stylesheet" href="/css/book.css" />
 </head>
--- a/novel-front/src/main/resources/templates/book/bookclass.html
+++ b/novel-front/src/main/resources/templates/book/bookclass.html
@ -2,10 +2,10 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'全部作品_'+#{website.name}"></title>
-    <meta name="keywords" th:content="#{website.name}+',小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学'"/>
+    <title th:text="'全部作品_'+${application.website.name}"></title>
+    <meta name="keywords" th:content="${application.website.name}+',小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学'"/>
    <meta name="description"
-          th:content="#{website.name}+'每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'。'"/>
+          th:content="${application.website.name}+'每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'。'"/>
    <link href="favicon.ico" type="image/x-icon" rel="shortcut icon"/>
    <link href="favicon.ico" type="image/x-icon" rel="Bookmark"/>
    <link rel="stylesheet" href="/css/main.css"/>
--- a/novel-front/src/main/resources/templates/common/footer.html
+++ b/novel-front/src/main/resources/templates/common/footer.html
@ -3,7 +3,7 @@
        <div class="copyright">
            <ul >
                <li class="menu"><a href="/?to=mobile">手机站</a><i class="line">|</i><a href="/">网站首页</a><i class="line">|</i><a href="/about/default.html" >关于我们</a><i class="line">|</i><a href="/about/contact.html" >联系我们</a><i class="line">|</i><a href="/user/feedback.html" >反馈留言</a><i class="line">|</i><a href="/author/index.html" >作家专区</a><i class="line">|</i><a href="/mobile/fiction_house.apk" >客户端</a></li>
-                <li th:text="'Copyright (C) '+#{website.domain}+' All rights reserved&nbsp;&nbsp;'+#{website.name}+'版权所有'"></li>
+                <li th:text="'Copyright (C) '+${application.website.domain}+' All rights reserved&nbsp;&nbsp;'+${application.website.name}+'版权所有'"></li>

            </ul>
        </div>
--- a/novel-front/src/main/resources/templates/common/top.html
+++ b/novel-front/src/main/resources/templates/common/top.html
@ -2,7 +2,7 @@
    <div class="topBar" style="display: none">
        <div class="box_center cf">
            <div class="top_l">
-                <a href="/" class="on" th:text="#{website.name}"></a><i class="line">|</i><a
+                <a href="/" class="on" th:text="${application.website.name}"></a><i class="line">|</i><a
                    href="/?m=2">手机女生版</a><i class="line">|</i><a
                    href="/?m=1">手机男生版</a><i class="line">|</i><a
                    href="/">客户端下载</a>
@ -21,7 +21,7 @@
    </div>
    <div class="topMain">
        <div class="box_center cf">
-            <a href="/?m=2" class="logo fl"><img src="/images/logo.png" th:alt="#{website.name}"/></a>
+            <a href="/?m=2" class="logo fl"><img src="/images/logo.png" th:alt="${application.website.name}"/></a>
            <div class="searchBar fl">
                <div class="search cf">
                    <input type="text" placeholder="书名、作者、关键字" class="s_int" name="searchKey" id="searchKey"/>
--- a/novel-front/src/main/resources/templates/index.html
+++ b/novel-front/src/main/resources/templates/index.html
@ -3,10 +3,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">

 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="#{website.name}+'_原创小说网站'"></title>
-    <meta name="keywords" th:content="#{website.name}+',小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学'"/>
+    <title th:text="${application.website.name}+'_原创小说网站'"></title>
+    <meta name="keywords" th:content="${application.website.name}+',小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学'"/>
    <meta name="description"
-          th:content="#{website.name}+'每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'。'"/>
+          th:content="${application.website.name}+'每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'。'"/>
    <link href="favicon.ico" type="image/x-icon" rel="shortcut icon"/>
    <link href="favicon.ico" type="image/x-icon" rel="Bookmark"/>
    <link rel="stylesheet" href="/css/main.css"/>
--- a/novel-front/src/main/resources/templates/mobile/book/book_ranking.html
+++ b/novel-front/src/main/resources/templates/mobile/book/book_ranking.html
@ -5,13 +5,13 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title th:text="#{website.name}+'列表'"></title>
+    <title th:text="${application.website.name}+'列表'"></title>

    <meta name="keywords"
-          th:content="#{website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">
+          th:content="${application.website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">

    <meta name="description"
-          th:content="#{website.name}+'是国内优秀的小说弹幕网站,'+#{website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">
+          th:content="${application.website.name}+'是国内优秀的小说弹幕网站,'+${application.website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">


    <div th:include="mobile/common/css :: css"></div>
--- a/novel-front/src/main/resources/templates/mobile/index.html
+++ b/novel-front/src/main/resources/templates/mobile/index.html
@ -6,17 +6,17 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">


-    <title th:text="#{website.name}"></title>
+    <title th:text="${application.website.name}"></title>

-    <meta name="keywords" th:content="#{website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">
+    <meta name="keywords" th:content="${application.website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">

    <meta name="description"
-          th:content="#{website.name}+'是国内优秀的小说弹幕网站,'+#{website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">
+          th:content="${application.website.name}+'是国内优秀的小说弹幕网站,'+${application.website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">

    <meta property="og:type" content="novel_index"/>
-    <meta property="og:title" th:content="#{website.name}"/>
+    <meta property="og:title" th:content="${application.website.name}"/>
    <meta property="og:description"
-          th:content="#{website.name}+'是国内优秀的小说弹幕网站,'+#{website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'"/>
+          th:content="${application.website.name}+'是国内优秀的小说弹幕网站,'+${application.website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'"/>


    <div th:include="mobile/common/css :: css"></div>
--- a/novel-front/src/main/resources/templates/pay/index.html
+++ b/novel-front/src/main/resources/templates/pay/index.html
@ -3,7 +3,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'充值_'+#{website.name}"></title>
+    <title th:text="'充值_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/base.css"/>
    <link rel="stylesheet" href="/css/main.css"/>
 </head>
--- a/novel-front/src/main/resources/templates/user/comment.html
+++ b/novel-front/src/main/resources/templates/user/comment.html
@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'我的书评_'+#{website.name}"></title>
+    <title th:text="'我的书评_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/user.css"/>
 </head>
 <body class="">
--- a/novel-front/src/main/resources/templates/user/favorites.html
+++ b/novel-front/src/main/resources/templates/user/favorites.html
@ -2,9 +2,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
    <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-        <title th:text="'我的书架_'+#{website.name}"></title>
-        <meta name="keywords" th:content="'我的书架,个人中心,'+#{website.name}+'小说,'+#{website.name}" />
-        <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />
+        <title th:text="'我的书架_'+${application.website.name}"></title>
+        <meta name="keywords" th:content="'我的书架,个人中心,'+${application.website.name}+'小说,'+${application.website.name}" />
+        <meta name="description" th:content="${application.website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'" />
        <link rel="stylesheet" href="/css/user.css" />
    </head>
 </head>
--- a/novel-front/src/main/resources/templates/user/feedback.html
+++ b/novel-front/src/main/resources/templates/user/feedback.html
@ -2,7 +2,7 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'反馈留言_'+#{website.name}"></title>
+    <title th:text="'反馈留言_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/user.css"/>
 </head>
 <body class="">
--- a/novel-front/src/main/resources/templates/user/feedback_list.html
+++ b/novel-front/src/main/resources/templates/user/feedback_list.html
@ -3,7 +3,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'我的反馈_'+#{website.name}"></title>
+    <title th:text="'我的反馈_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/user.css"/>
 </head>
 <body class="">
--- a/novel-front/src/main/resources/templates/user/login.html
+++ b/novel-front/src/main/resources/templates/user/login.html
@ -3,9 +3,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'会员登录_'+#{website.name}"></title>
-    <meta name="keywords" th:content="'会员登录,个人中心,'+#{website.name}+'小说,'+#{website.name}" />
-    <meta name="description"  th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />
+    <title th:text="'会员登录_'+${application.website.name}"></title>
+    <meta name="keywords" th:content="'会员登录,个人中心,'+${application.website.name}+'小说,'+${application.website.name}" />
+    <meta name="description"  th:content="${application.website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'" />
    <link rel="stylesheet" href="/css/user.css" />
 </head>
 <body class="">
@ -26,7 +26,7 @@
                    <input type="hidden" name="__VIEWSTATEGENERATOR" id="__VIEWSTATEGENERATOR" value="C93BE1AE" />
                    <input type="hidden" name="__EVENTVALIDATION" id="__EVENTVALIDATION" value="/wEdAAXkRxK+hbBn9D6bVAXo8t/4qKSXUE1UN51mNFrIuw38c3Y2+Mc6SrnAqio3oCKbxYainihG6d/Xh3PZm3b5AoMQ2xnvcKe7Apj/DdmzfeCXoTjAjITeRewsBR3AmjdQ75+yP5bUUcdUUiZlMKONJDef" />
                </div>
-                <h3 th:text="'登陆'+#{website.name}"></h3>
+                <h3 th:text="'登陆'+${application.website.name}"></h3>
                <ul class="log_list">
                    <li><span id="LabErr"></span></li>
                    <li><input name="txtUName" type="text" id="txtUName" placeholder="手机号码" class="s_input icon_name" /></li>
--- a/novel-front/src/main/resources/templates/user/read_history.html
+++ b/novel-front/src/main/resources/templates/user/read_history.html
@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'最近阅读_'+#{website.name}"></title>
+    <title th:text="'最近阅读_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/user.css"/>
 </head>
 <body class="">
--- a/novel-front/src/main/resources/templates/user/register.html
+++ b/novel-front/src/main/resources/templates/user/register.html
@ -2,10 +2,10 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
-    <title th:text="'会员注册_'+#{website.name}"></title>
-    <meta name="keywords" th:content="'会员注册,个人中心,'+#{website.name}+'小说,'+#{website.name}"/>
+    <title th:text="'会员注册_'+${application.website.name}"></title>
+    <meta name="keywords" th:content="'会员注册,个人中心,'+${application.website.name}+'小说,'+${application.website.name}"/>
    <meta name="description"
-          th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'"/>
+          th:content="${application.website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+${application.website.name}+'小说！'"/>
    <link rel="stylesheet" href="/css/user.css" />
 </head>
 <body class="">
@ -28,7 +28,7 @@
                       value="/wEdAAVece19BIZ9HiByRfHz3pfnqKSXUE1UN51mNFrIuw38c3Y2+Mc6SrnAqio3oCKbxYZZ1lS+gZUZKpbsAea8j7ASAv40DHFcQ/NE7tJUnABeyQ3d9sFDIcFCYNqlVtprfLoh4JFy0U+R/CcMuyAiWTz7"/>
            </div>
            <div class="user_l">
-                <h3 th:text="'注册'+#{website.name}+'小说账号'"></h3>
+                <h3 th:text="'注册'+${application.website.name}+'小说账号'"></h3>
                <ul class="log_list">
                    <li><span id="LabErr"></span></li>
                    <li><input name="txtUName" type="text" id="txtUName" class="s_input icon_name"
--- a/novel-front/src/main/resources/templates/user/set_name.html
+++ b/novel-front/src/main/resources/templates/user/set_name.html
@ -2,7 +2,7 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'修改昵称_'+#{website.name}"></title>
+    <title th:text="'修改昵称_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/user.css"/>
 </head>
 <body class="">
--- a/novel-front/src/main/resources/templates/user/set_password.html
+++ b/novel-front/src/main/resources/templates/user/set_password.html
@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'修改密码_'+#{website.name}"></title>
+    <title th:text="'修改密码_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/user.css"/>
 </head>
 <body class="">
--- a/novel-front/src/main/resources/templates/user/set_sex.html
+++ b/novel-front/src/main/resources/templates/user/set_sex.html
@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'修改性别_'+#{website.name}"></title>
+    <title th:text="'修改性别_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/user.css"/>
 </head>
 <body class="">
--- a/novel-front/src/main/resources/templates/user/setup.html
+++ b/novel-front/src/main/resources/templates/user/setup.html
@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'账号设置_'+#{website.name}"></title>
+    <title th:text="'账号设置_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/user.css"/>
 </head>
 <body class="">
--- a/novel-front/src/main/resources/templates/user/userinfo.html
+++ b/novel-front/src/main/resources/templates/user/userinfo.html
@ -3,7 +3,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
-    <title th:text="'个人中心_'+#{website.name}"></title>
+    <title th:text="'个人中心_'+${application.website.name}"></title>
    <link rel="stylesheet" href="/css/user.css"/>
 </head>
 <body class="">
--- a/pom.xml
+++ b/pom.xml
@ -5,7 +5,7 @@

    <groupId>com.java2nb</groupId>
    <artifactId>novel</artifactId>
-    <version>3.1.0</version>
+    <version>3.3.0</version>
    <modules>
        <module>novel-common</module>
        <module>novel-front</module>
--- a/templates/blue/html/404.html
+++ b/templates/blue/html/404.html
@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Page Not Found</title>
+    <script>
+        setTimeout(function () {
+            location.href = '/';
+        },3000)
+
+    </script>
+</head>
+<body style="background: url(/images/404.jpeg) no-repeat;" >
+
+
+</body>
+</html>
--- a/templates/blue/html/common/footer.html
+++ b/templates/blue/html/common/footer.html
@ -0,0 +1,5 @@
+<div th:fragment="footer" class="footer">
+        <div style="display: none"></div>
+        <p><a href="/" rel="index">小说精品屋</a>所有内容使用搜索引擎转码技术抓取自网络，如有侵犯版权，请来信告知，本站立即处理。</p>
+        <p>Copyright © 2019-2020 http://www.java2nb.com All rights reserved.</p>
+</div>
--- a/templates/blue/html/common/header.html
+++ b/templates/blue/html/common/header.html
@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:fragment="common_head(title,meta,links,script)">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <title th:replace="${title}">小说精品屋</title>
+    <link rel="stylesheet" href="/css/base.css?v=1"/>
+    <th:block th:replace="${meta}"/>
+    <th:block th:replace="${links}"/>
+    <th:block th:replace="${script}"/>
+    <script>
+        var _hmt = _hmt || [];
+        (function() {
+            var hm = document.createElement("script");
+            hm.src = "https://hm.baidu.com/hm.js?ecc8b50a3122e6d5e09be7a9e5383e07";
+            var s = document.getElementsByTagName("script")[0];
+            s.parentNode.insertBefore(hm, s);
+        })();
+    </script>
+
+</head>
+<body>
+
+</body>
+</html>
--- a/templates/blue/html/common/js.html
+++ b/templates/blue/html/common/js.html
@ -0,0 +1,4 @@
+<script th:fragment="js" src="/javascript/jquery-1.8.0.min.js" type="text/javascript"></script>
+<script th:fragment="js" src="/layui/layui.all.js" type="text/javascript"></script>
+<script th:fragment="js" src="/javascript/header.js" type="text/javascript"></script>
+<script th:fragment="js" src="/javascript/common.js" type="text/javascript"></script>
--- a/templates/blue/html/common/top.html
+++ b/templates/blue/html/common/top.html
@ -0,0 +1,28 @@
+<div th:fragment="top(navType)" class="header">
+        <div class="inner">
+            <div class="logo"><a href="/"><img src="/images/logo.png" alt="小说精品屋"></a></div>
+            <div class="nav">
+                <ul class="clearfix">
+                    <li class="on">
+                        <a href="/">首页</a>
+                    </li>
+                    <li>
+                        <a href="/#">书库</a>
+                    </li>
+                    <li>
+                        <a href="/#">排行</a>
+                    </li>
+                </ul>
+            </div>
+            <div class="search">
+                <form method="get" name="search" action="/#" target="_blank">
+                    <input type="text" name="keyword" id="q" placeholder="请输入书名·作者" class="search-key">
+                    <button type="submit" class="search-btn" id="search-btn">搜索</button>
+                </form>
+            </div>
+            <div class="other">
+                <a class="link-wap" href="/">手机版</a>
+
+            </div>
+        </div>
+</div>
--- a/templates/blue/html/index.html
+++ b/templates/blue/html/index.html
@ -0,0 +1,293 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>小说精品屋无弹窗广告小说免费阅读,值得收藏的小说阅读网 - 小说精品屋</title>
+    <meta name="keywords" content="小说精品屋">
+    <meta name="description"
+          content="小说精品屋致力于提供无弹窗广告小说在线免费阅读,一个值得收藏的小说阅读网。小说精品屋收录了当前最火热的网络小说,免费提供高质量的小说最新章节,小说TXT全文,小说爱好者必备。">
+    <link href="/favicon.ico" rel="shortcut icon">
+    <link href="/css/base.css" rel="stylesheet" type="text/css">
+    <link href="/css/hs13.css" rel="stylesheet" type="text/css">
+    <link href="/layui/css/layui.css" rel="stylesheet" type="text/css">
+    <script src="/javascript/jquery-1.7.2.min.js"></script>
+    <script src="/javascript/function.js"></script>
+</head>
+<body>
+<!--header-->
+<div th:replace="common/top :: top('0')">
+</div>
+<!--/header-->
+<!--container-->
+<div class="container clearfix">
+
+    <div class="wrap box3 clearfix">
+        <div class="rec-book">
+            <h3>精品推荐</h3>
+            <div id="classicBook" class="carousel">
+            </div>
+            <div class="rec-list">
+                <ul id="classicBooks">
+                </ul>
+            </div>
+
+        </div>
+        <div class="latest-news">
+            <!--category-->
+            <div class="category">
+                <ul class="clearfix">
+                    <li><a href="#" target="_self">玄幻奇幻</a></li>
+                    <li><a href="#" target="_self">武侠仙侠</a></li>
+                    <li><a href="#" target="_self">都市言情</a></li>
+                    <li><a href="#" target="_self">历史军事</a></li>
+                    <li><a href="#" target="_self">科幻灵异</a></li>
+                    <li><a href="#" target="_self">网游竞技</a></li>
+                    <li><a href="#" target="_self">女生频道</a></li>
+                </ul>
+            </div>
+        </div>
+        <div class="wrap box3 clearfix">
+            <div class="rec-book">
+                <h3>热门推荐</h3>
+                <div id="hotRecBook" class="carousel">
+
+                </div>
+                <div class="rec-list">
+                    <ul class="clearfix" id="hotRecBooks">
+                    </ul>
+                </div>
+            </div>
+            <div class="latest-news">
+                <h3>最新新闻</h3>
+                <ul id="indexNews">
+                </ul>
+            </div>
+        </div>
+        <!--/box3-->
+        <!--box4-->
+        <div class="wrap box4 clearfix">
+            <div class="new-book">
+                <h3>最近更新</h3>
+                <!--tab1-->
+                <ul class="clearfix home_cid_list" id="updateRankBooks">
+                </ul>
+            </div>
+        </div>
+        <!--/box4-->
+        <!--box5-->
+        <!--/box5-->
+        <!--friend-link-->
+        <div class="wrap clearfix">
+            <div class="friend-link">
+                <h5>友情链接</h5>
+                <ul class="clearfix" id="friendLink" style="padding: 10px">
+                </ul>
+            </div>
+        </div>
+        <!--/friend-link-->
+    </div>
+    <script src="/javascript/focus.js"></script>
+    <!--/container-->
+    <!--footer-->
+    <div th:replace="common/footer :: footer">
+    </div>
+    <!--/footer-->
+
+    <script type="text/javascript" src="/layui/layui.js"></script>
+    <script type="text/javascript" src="/javascript/bookcase.js"></script>
+    <script type="text/javascript">
+        //搜索输入字符串合法性验证
+        $("#search-btn").on("click", function () {
+            var str = $("#q").val();
+            var ret = /[^\w\u4e00-\u9fa5]/;
+            if (ret.test(str)) {
+                alert("搜索内容不合法");
+                return false;
+            } else if (str === null || str === undefined || str === '') {
+                alert("搜索内容不能为空");
+                return false;
+            } else {
+                return ture;
+            }
+        });
+
+        $(function () {
+            //加载首页书籍设置数据
+            $.ajax({
+                type: "get",
+                url: "/book/listBookSetting",
+                data: {},
+                dataType: "json",
+                success: function (data) {
+                    if (data.code == 200) {
+
+
+                        //热门推荐
+                        var hotRecBooks = data.data[3];
+                        var hotRecBooksHtml = "";
+                        for (var i = 0; i < hotRecBooks.length; i++) {
+                            var hotRecBook = hotRecBooks[i];
+                            if(i == 0){
+                                $("#hotRecBook").html("<div class=\"carousel-img\">\n" +
+                                    "                        <a href=\"/book/"+hotRecBook.bookId+".html\" target=\"_blank\" title=\""+hotRecBook.bookName+"\"><img class=\"lazy\"\n" +
+                                    "                                                                                                          src=\""+hotRecBook.picUrl+"\"\n" +
+                                    "                                                                                                          alt=\""+hotRecBook.bookName+"\"></a>\n" +
+                                    "                    </div>\n" +
+                                    "                    <ul class=\"carousel-nav\">\n" +
+                                    "                        <li >\n" +
+                                    "                            <h4><a href=\"#\" target=\"_blank\">"+hotRecBook.bookName+"</a></h4>\n" +
+                                    "                            <p class=\"author\">"+hotRecBook.authorName+"</p>\n" +
+                                    "                            <p class=\"info\"><span class=\"type\">"+hotRecBook.catName+"</span><span class=\"serial\">连载中</span></p>\n" +
+                                    "                            <p class=\"intro\">"+hotRecBook.bookDesc+"</p>\n" +
+                                    "                            <a class=\"view\" href=\"#\" target=\"_blank\">小说详情</a>\n" +
+                                    "                        </li>\n" +
+                                    "                    </ul>");
+                            }else{
+                            hotRecBooksHtml += ("<li>\n" +
+                                "                            <a class=\"pic\" href=\"#\" target=\"_blank\"><img class=\"lazy\"\n" +
+                                "                                                                                                           src=\""+hotRecBook.picUrl+"\"\n" +
+                                "                                                                                                           alt=\""+hotRecBook.bookName+"\"></a>\n" +
+                                "                            <h5 class=\"tit\"><a href=\"#\" target=\"_blank\">"+hotRecBook.bookName+"</a>\n" +
+                                "                            </h5>\n" +
+                                "                            <p class=\"intro\">"+hotRecBook.bookDesc+"</p>\n" +
+                                "                            <p class=\"info\">作者：<span>"+hotRecBook.authorName+"</span><em>"+hotRecBook.catName+"</em></p>\n" +
+                                "                        </li>");
+                            }
+
+                        }
+                        $("#hotRecBooks").html(hotRecBooksHtml);
+
+                        //精品推荐
+                        var classicBooks = data.data[4];
+                        var classicBooksHtml = "";
+                        for (var i = 0; i < classicBooks.length; i++) {
+                            var classicBook = classicBooks[i];
+                            if(i == 0) {
+                                $("#classicBook").html("<div class=\"carousel-img\">\n" +
+                                    "                        <a href=\"/book/"+classicBook.bookId+".html\" target=\"_blank\" title=\""+classicBook.bookName+"\"><img class=\"lazy\"\n" +
+                                    "                                                                                                          src=\""+classicBook.picUrl+"\"\n" +
+                                    "                                                                                                          alt=\""+classicBook.bookName+"\"></a>\n" +
+                                    "                    </div>\n" +
+                                    "                    <ul class=\"carousel-nav\">\n" +
+                                    "                        <li >\n" +
+                                    "                            <h4><a href=\"#\" target=\"_blank\">"+classicBook.bookName+"</a></h4>\n" +
+                                    "                            <p class=\"author\">"+classicBook.authorName+"</p>\n" +
+                                    "                            <p class=\"info\"><span class=\"type\">"+classicBook.catName+"</span><span class=\"serial\">连载中</span></p>\n" +
+                                    "                            <p class=\"intro\">"+classicBook.bookDesc+"</p>\n" +
+                                    "                            <a class=\"view\" href=\"#\" target=\"_blank\">小说详情</a>\n" +
+                                    "                        </li>\n" +
+                                    "                    </ul>");
+                            }else{
+                                classicBooksHtml += ("<li>\n" +
+                                    "                            <a class=\"pic\" href=\"#\" target=\"_blank\"><img class=\"lazy\"\n" +
+                                    "                                                                                                           src=\""+classicBook.picUrl+"\"\n" +
+                                    "                                                                                                           alt=\""+classicBook.bookName+"\"></a>\n" +
+                                    "                            <h5 class=\"tit\"><a href=\"#\" target=\"_blank\">"+classicBook.bookName+"</a>\n" +
+                                    "                            </h5>\n" +
+                                    "                            <p class=\"intro\">"+classicBook.bookDesc+"</p>\n" +
+                                    "                            <p class=\"info\">作者：<span>"+classicBook.authorName+"</span><em>"+classicBook.catName+"</em></p>\n" +
+                                    "                        </li>");
+
+                            }
+
+                        }
+                        $("#classicBooks").html(classicBooksHtml);
+
+
+                    } else {
+                        layer.alert(data.msg);
+                    }
+
+                },
+                error: function () {
+                    layer.alert('网络异常');
+                }
+            })
+            //首页新闻查询
+            $.ajax({
+                type: "get",
+                url: "/news/listByPage",
+                data: {'curr':1,'limit':12},
+                dataType: "json",
+                success: function (data) {
+                    if (data.code == 200) {
+                        var indexNewsList = data.data.list;
+                        var indexNewsHtml = "";
+                        for (var i = 0; i < indexNewsList.length; i++) {
+                            var indexNews = indexNewsList[i];
+                            indexNewsHtml += ("<li><em>"+indexNews.createTime.substring(5,10)+"</em><a href=\"#\"\n" +
+                                "                                         target=\"_blank\">"+indexNews.title+"</a></li>");
+                        }
+                        $("#indexNews").html(indexNewsHtml);
+                    } else {
+                        layer.alert(data.msg);
+                    }
+
+                },
+                error: function () {
+                    layer.alert('网络异常');
+                }
+            })
+
+
+            //更新榜单查询
+            $.ajax({
+                type: "get",
+                url: "/book/listUpdateRank",
+                data: {},
+                dataType: "json",
+                success: function (data) {
+                    if (data.code == 200) {
+                        var updateRankBooks = data.data;
+                        var updateRankBookHtml = "";
+                        for (var i = 0; i < updateRankBooks.length; i++) {
+                            var updateRankBook = updateRankBooks[i];
+                            updateRankBookHtml += ("<li>\n" +
+                                "                        <a href=\"#\" target=\"_blank\"><img class=\"lazy\"\n" +
+                                "                                                                                          src=\""+updateRankBook.picUrl+"\"\n" +
+                                "                                                                                          alt=\""+updateRankBook.bookName+"\"><span>"+updateRankBook.bookName+"</span></a>\n" +
+                                "                        \n" +
+                                "                    </li>");
+                        }
+                        $("#updateRankBooks").html(updateRankBookHtml);
+                    } else {
+                        layer.alert(data.msg);
+                    }
+
+                }
+                ,
+                error: function () {
+                    layer.alert('网络异常');
+                }
+            })
+            //友情链接查询
+            $.ajax({
+                type: "get",
+                url: "/friendLink/listIndexLink",
+                data: {},
+                dataType: "json",
+                success: function (data) {
+                    if (data.code == 200) {
+                        var friendLinkList = data.data;
+                        var friendLinkHtml = "";
+                        for (var i = 0; i < friendLinkList.length; i++) {
+                            var friendLink = friendLinkList[i];
+                            friendLinkHtml += ("<li><a target='_blank' href=\""+friendLink.linkUrl+"\">"+friendLink.linkName+"</a></li>");
+                        }
+                        $("#friendLink").append(friendLinkHtml);
+                    } else {
+                        layer.alert(data.msg);
+                    }
+
+                },
+                error: function () {
+                    layer.alert('网络异常');
+                }
+            })
+        });
+    </script>
+
+    <script src="/layui/lay/modules/layer.js"></script>
+</div>
+</body>
+</html>
--- a/templates/blue/static/css/base.css
+++ b/templates/blue/static/css/base.css
@ -0,0 +1,361 @@
+body,dl,dd,dt,p,ol,ul,li,h1,h2,h3,h4,h5,h6,b,strong,em,input,textarea,button,select {
+    margin: 0;
+    padding: 0;
+}
+html,body {
+    height: 100%;
+}
+body {
+    color: #484848;
+    font: 14px/1 "microsoft yahei";
+    background: #fff;
+}
+i,s,u,em {
+    font-style: normal;
+    text-decoration: none;
+}
+h1,h2,h3,h4,h5,h6,b {
+    font-weight: normal;
+}
+input,textarea,button,select {
+    font-size: 14px;
+    font-family: "microsoft yahei";
+    outline: 0 none;
+}
+li {
+    list-style: none;
+}
+img {
+    border: none;
+    vertical-align: top;
+}
+a {
+    color: #484848;
+    text-decoration: none;
+    transition: color .1s,background-color .1s,border .1s;
+}
+a:hover {
+    color: #ff6939;
+}
+input::input-placeholder {
+    color: #80b0c8!important;
+}
+::-webkit-input-placeholder {
+    color: #80b0c8!important;
+}
+:-moz-placeholder {
+    color: #80b0c8!important;
+}
+::-moz-placeholder {
+    color: #80b0c8!important;
+}
+:-ms-input-placeholder {
+    color: #80b0c8!important;
+}
+.clearfix:before,
+.clearfix:after {
+    clear: both;
+    display: block;
+    visibility: hidden;
+    overflow: hidden;
+    height: 0;
+    content: " ";
+}
+.lf {
+    float: left;
+}
+.rf {
+    float: right;
+}
+.tips {
+    position: absolute;
+    z-index: 2000;
+    display: none;
+    height: 54px;
+    line-height: 54px;
+    background: rgba(0, 0, 0, 0.7);
+    border-radius: 5px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    -ms-border-radius: 5px;
+    color: #fff;
+    font-size: 16px;
+}
+.tips i {
+    width: 0;
+    height: 0;
+}
+.tips span {
+    padding: 0 25px;
+    width:auto;
+    height:54px;
+}
+/*header*/
+.header {
+    width: 100%;
+    background: #0189d0;
+}
+.header .inner {
+    margin: 0 auto;
+    height: 70px;
+    width: 1200px;
+}
+.header .logo {
+    float: left;
+    margin-top: 15px;
+    width: 150px;
+    height: 40px;
+    overflow: height;
+}
+.header .logo img {
+    width: 100%;
+    height: 100%;
+}
+.header .nav {
+    float: left;
+    margin-left: 40px;
+    margin-top: 15px;
+}
+.header .nav ul {
+    height: 40px;
+}
+.header .nav ul li {
+    float: left;
+}
+.header .nav ul li a {
+    display: inline-block;
+    margin: 2px 0;
+    padding: 0 24px;
+    height: 36px;
+    line-height: 36px;
+    font-size: 18px;
+    color: #fff;
+    background: transparent;
+    border-radius: 100px;
+}
+.header .nav ul li.on a {
+    background: #279bd7;
+}
+.header .search {
+    float: left;
+    margin-left: 340px;
+    margin-top: 17px;
+    width: 260px;
+    height: 36px;
+    background: #016ea6;
+    border-radius: 18px;
+}
+.header .search .search-key {
+    float: left;
+    margin-left: 20px;
+    width: 200px;
+    height: 36px;
+    color: #d4dee7;
+    background: none;
+    border: none;
+}
+.header .search .search-btn {
+    float: right;
+    width: 40px;
+    height: 36px;
+    text-indent: -999px;
+    background: url(../images/icon-search.png) no-repeat 50% 50%;
+    border: none;
+    overflow: hidden;
+    cursor: pointer;
+}
+.header .other {
+    float: left;
+    margin-left: 30px;
+    margin-top: 17px;
+}
+.header .other .link-wap {
+    display: inline-block;
+    padding-left: 22px;
+    line-height: 36px;
+    font-size: 18px;
+    color: #fff;
+    background: url(/images/icon-mobile.png) no-repeat 0 50%;
+}
+.header .other .link-bookshelf {
+    margin-left: 15px;
+    display: inline-block;
+    line-height: 36px;
+    padding-left: 20px;
+    font-size: 18px;
+    color: #fff;
+    background: url(../images/icon-bookshelf.png) no-repeat 0 50%;
+}
+.header .other .link-hs13 {
+    margin-left: 15px;
+    display: inline-block;
+    line-height: 36px;
+    font-size: 18px;
+    color: #fff;
+}
+/*footer*/
+.footer {
+    padding: 20px 0;
+    width: 100%;
+    background: #fff;
+    border-top: 2px solid #0189d0;
+    overflow: hidden;
+}
+.footer p {
+    line-height: 2;
+    font-size: 18px;
+    color: #999;
+    text-align: center;
+}
+.footer p a {
+    color: #999;
+}
+.footer p a:hover {
+    color: #fc6e38;
+}
+
+/*bookshelf*/
+.bookshelf-mask {
+    display: block;
+    width: 100%;
+    height: 100%;
+    background: #000;
+    opacity: 0.5;
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 10000;
+    _position: absolute;
+    _top:expression(eval(document.documentElement.scrollTop));
+}
+.bookshelf-panel {
+    display: block;
+    margin-left: -320px;
+    margin-top: -240px;
+    width: 640px;
+    height: 480px;
+    background: #fff;
+    box-shadow: 0 0 10px rgba(0,0,0,0.5);
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    z-index: 10001;
+    _position: absolute;
+    _left:expression(eval(document.body.clientWidth-this.offsetWidth)/2);
+    _top:expression(eval(document.body.clientHeight-this.offsetHeight)/2);
+}
+.bookshelf-head {
+    height: 49px;
+    border-bottom: 1px solid #ebebeb;
+}
+.bookshelf-head h4 {
+    float: left;
+    margin-left: 20px;
+    line-height: 49px;
+    font-size: 18px;
+    font-weight: bold;
+    color: #333;
+}
+.bookshelf-head a {
+    float: right;
+    margin-top: 18px;
+    margin-right: 15px;
+    cursor: pointer;
+}
+.bookshelf-head a:hover {
+    background-position: 0 -24px;
+}
+.bookshelf-list {
+    height: 430px;
+    position: relative;
+    overflow-y: auto;
+}
+.bookshelf-list ul li {
+    position: relative;
+    padding: 15px 15px;
+    height: 107px;
+    border-bottom: 1px dashed #ebebeb;
+}
+.bookshelf-list ul li:hover {
+    background: #fffbf2;
+}
+.bookshelf-list ul li .pic {
+    position: relative;
+    float: left;
+    margin-right: 15px;
+    width: 80px;
+    height: 107px;
+}
+.bookshelf-list ul li .pic img {
+    width: 100%;
+    height: 100%;
+    vertical-align: top;
+}
+.bookshelf-list ul li .pic i {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    display: block;
+    width: 100%;
+    height: 20px;
+    line-height: 20px;
+    text-align: center;
+}
+.bookshelf-list ul li .pic i.serial {
+    background: #489738;
+    background: rgba(72,151,56,.9);
+    color: #fff;
+}
+.bookshelf-list ul li .pic i.finish {
+    background: #c9142a;
+    background: rgba(201,20,42,.9);
+    color: #fff;
+}
+.bookshelf-list ul li .tit {
+    display: block;
+    margin-bottom: 10px;
+    line-height: 24px;
+    font-size: 18px;
+}
+.bookshelf-list ul li .update {
+    display: block;
+    margin-bottom: 19px;
+    line-height: 24px;
+}
+.bookshelf-list ul li .update a {
+    color: #0189d0;
+}
+.bookshelf-list ul li .read {
+    display: block;
+}
+.bookshelf-list ul li .read a {
+    display: inline-block;
+    width: 90px;
+    height: 28px;
+    line-height: 28px;
+    color: #ff6939;
+    text-align: center;
+    border: 1px solid #ff6939;
+    border-radius: 100px;
+}
+.bookshelf-list ul li .del {
+    position: absolute;
+    right: 15px;
+    top: 15px;
+    width: 24px;
+    height: 24px;
+    cursor: pointer;
+    background: url(../images/close.png) no-repeat 0 0;
+}
+.bookshelf-list ul li .del:hover {
+    background-position: 0 -24px;
+}
+
+.newChapter {
+    width: 30px;
+    height: 15px;
+    display: inline-block;
+    vertical-align: middle;
+    margin-top: -4px;
+    background: url(../images/new.png) no-repeat;
+}
--- a/templates/blue/static/css/hs13.css
+++ b/templates/blue/static/css/hs13.css
--- a/templates/blue/static/css/layer.css
+++ b/templates/blue/static/css/layer.css
--- a/templates/blue/static/images/00461096688e0a478d1a6d1fcbdeca2f.jpeg
+++ b/templates/blue/static/images/00461096688e0a478d1a6d1fcbdeca2f.jpeg
--- a/templates/blue/static/images/0244fe0f2c8cce4be7a725fb9c65f9ab(1).png
+++ b/templates/blue/static/images/0244fe0f2c8cce4be7a725fb9c65f9ab(1).png
--- a/templates/blue/static/images/0244fe0f2c8cce4be7a725fb9c65f9ab.png
+++ b/templates/blue/static/images/0244fe0f2c8cce4be7a725fb9c65f9ab.png
--- a/templates/blue/static/images/042243bc824bde99c472695a8fe30eb2.png
+++ b/templates/blue/static/images/042243bc824bde99c472695a8fe30eb2.png
--- a/templates/blue/static/images/1d4db885f2a6f1d82e269690148574a9.jpeg
+++ b/templates/blue/static/images/1d4db885f2a6f1d82e269690148574a9.jpeg
--- a/templates/blue/static/images/1ee504905796139af00de08c15314061.jpeg
+++ b/templates/blue/static/images/1ee504905796139af00de08c15314061.jpeg
--- a/templates/blue/static/images/21ce38bbc9b2e31288c3db798a86479e.jpeg
+++ b/templates/blue/static/images/21ce38bbc9b2e31288c3db798a86479e.jpeg
--- a/templates/blue/static/images/2356e25f8027f1223dcb8509d35d2f26.jpg
+++ b/templates/blue/static/images/2356e25f8027f1223dcb8509d35d2f26.jpg
--- a/templates/blue/static/images/3eb4b2fe826774e8829abbed9bddedfa.jpeg
+++ b/templates/blue/static/images/3eb4b2fe826774e8829abbed9bddedfa.jpeg
--- a/templates/blue/static/images/41a5378065ddab5d6fabb29656d7cac9.jpeg
+++ b/templates/blue/static/images/41a5378065ddab5d6fabb29656d7cac9.jpeg
--- a/templates/blue/static/images/4b17d590cdf430b053b64edfa224a901.jpeg
+++ b/templates/blue/static/images/4b17d590cdf430b053b64edfa224a901.jpeg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xiongxiaoyang	ab741ec6bf	v3.3.0发布	2020-12-28 12:06:19 +08:00
xiongxiaoyang	057c0646cd	v3.3.0发布	2020-12-28 12:02:34 +08:00
xiongxiaoyang	57a9cd09ef	v3.3.0发布	2020-12-28 11:06:27 +08:00
xiongxiaoyang	1a49e2a340	增加外部配置文件来配置网站信息	2020-12-28 10:58:38 +08:00
xiongxiaoyang	f8411c2337	v3.3.0发布	2020-12-28 09:34:22 +08:00
xiongxiaoyang	343a741c21	更新展示图片	2020-12-27 15:54:50 +08:00
xiongxiaoyang	f1a5fb4813	更新展示图片	2020-12-27 15:34:23 +08:00
xiongxiaoyang	0428356bd4	新增蓝色主题模版	2020-12-27 09:43:45 +08:00
xiongxiaoyang	c01097cd5f	更新v3.3.0的安装文档	2020-12-26 23:53:05 +08:00
xiongxiaoyang	7e650a0a04	修改版本号	2020-12-26 22:27:51 +08:00
xiongxiaoyang	45c59ecc37	前端新增深色主题模版	2020-12-26 22:16:58 +08:00
xiongxiaoyang	5e3962fef4	update	2020-12-26 20:10:11 +08:00
xiongxiaoyang	7f5035e369	update	2020-12-26 20:08:07 +08:00
xiongxiaoyang	44aad39847	update	2020-12-26 20:00:21 +08:00
xiongxiaoyang	6ad51908d5	文件夹结构调整，新增模版自定义功能	2020-12-26 19:13:07 +08:00
xiongxiaoyang	f03ab953d0	v3.2.0发布	2020-12-26 11:45:19 +08:00
xiongxiaoyang	5cc9dfa1bc	v3.2.0发布	2020-12-26 11:42:09 +08:00
xiongxiaoyang	2fbda60617	修复jwt校验失败后的bug	2020-12-24 17:13:36 +08:00
xiongxiaoyang	39c19ac004	页面不存在则跳转到404页面	2020-12-24 16:54:37 +08:00
xiongxiaoyang	7494fe431a	页面不存在则跳转到404页面	2020-12-24 16:45:48 +08:00
xiongxiaoyang	c9f1500976	新增404页面，访问已删除的书页/目录页/内容页自动跳转到404页面	2020-12-24 16:26:21 +08:00
xiongxiaoyang	f61c252e71	爬虫代码优化	2020-12-24 01:30:00 +08:00
xiongxiaoyang	6fd183c2ae	爬虫代码优化	2020-12-24 01:22:19 +08:00
xiongxiaoyang	c3daaecaaa	爬虫代码优化	2020-12-24 01:17:52 +08:00
xiongxiaoyang	1b6cc8ccd5	爬虫代码优化	2020-12-24 00:10:19 +08:00
xiongxiaoyang	0a10504461	优化章节字数算法，优化爬虫代码	2020-12-23 23:48:34 +08:00
xiongxiaoyang	1046a7ffc1	后台数据校验优化	2020-12-22 23:12:22 +08:00
xiongxiaoyang	612555dbe6	更新QQ群	2020-12-22 09:35:24 +08:00
xiongxiaoyang	d5768e4011	后台首页gitee仓库地址更新	2020-12-21 17:51:54 +08:00
xiongxiaoyang	5982eb623f	更新文档	2020-12-16 09:53:39 +08:00
xiongxiaoyang	85ad5fa3b2	增加官网地址	2020-12-15 10:23:12 +08:00