build: 修改版本号

超级管理员增加网站信息修改权限

README.md

@@ -9,7 +9,7 @@
 </p>
 
 <p align="center">
-      👉 <a href='https://novel.xxyopen.com'>官网</a>  |  👉 <a href='http://47.106.243.172:8888'>演示站点</a>  |  👉 <a href='https://docs.xxyopen.com/course/novelplus/'>项目文档（含安装教程）</a>
+      👉 <a href='https://novel.xxyopen.com'>官网</a>  |  👉 <a href='https://www.bilibili.com/video/BV1Zo4y187Mi'>项目演示</a>  |  👉 <a href='https://docs.xxyopen.com/course/novelplus/1.html'>安装教程</a>
 </p> 
 
 ## 项目介绍
@@ -50,8 +50,7 @@ novel-plus -- 父工程
 | Spring Security      | 安全框架
 | Apache Shiro               | 安全框架
 | Redis               | 缓存方案
-| Aliyun OSS          | 阿里云对象存储服务(图片存储方式之一，一行配置即可切换)
-| FastDFS             | 开源轻量级分布式文件系统(图片存储方式之一，一行配置即可切换)
+| Aliyun OSS          | 阿里云对象存储服务（图片存储备选方案）
 | Lombok              | 简化对象封装工具
 | Docker              | 应用容器引擎
 | MySQL               | 数据库服务

doc/sql/20230418.sql

@@ -0,0 +1,51 @@
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('轮播图', '0', 'book_rec_type', '小说推荐类型', 0, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('顶部小说栏', '1', 'book_rec_type', '小说推荐类型', 1, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('本周强推', '2', 'book_rec_type', '小说推荐类型', 2, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('热门推荐', '3', 'book_rec_type', '小说推荐类型', 3, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('精品推荐', '4', 'book_rec_type', '小说推荐类型', 4, null, null, null, null, null, '', null);
+
+
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (320, '300', '小说推荐', 'novel/bookSetting', 'novel:bookSetting:bookSetting', '1', 'fa', '6');
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (321, '320', '查看', null, 'novel:bookSetting:detail', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (322, '320', '新增', null, 'novel:bookSetting:add', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (323, '320', '修改', null, 'novel:bookSetting:edit', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (324, '320', '删除', null, 'novel:bookSetting:remove', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (325, '320', '批量删除', null, 'novel:bookSetting:batchRemove', '2', null, '6');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 320);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 321);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 322);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 323);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 324);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 325);
+
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (410, '400', '会员反馈', 'novel/userFeedback', 'novel:userFeedback:userFeedback', '1', 'fa', '16');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 410);

doc/sql/20230508.sql

@@ -0,0 +1,4 @@
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (305, '301', '修改', null, 'novel:websiteInfo:edit', '2', null, '6');
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 305);

doc/sql/novel_plus.sql

@@ -2947,4 +2947,62 @@ VALUES (1, 603);
 INSERT INTO `sys_menu` (menu_id, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
 VALUES (604, 603, '删除', null, 'novel:bookComment:remove', '2', null, '6');
 INSERT INTO sys_role_menu (role_id, menu_id)
-VALUES (1, 604);
+VALUES (1, 604);
+
+
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('轮播图', '0', 'book_rec_type', '小说推荐类型', 0, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('顶部小说栏', '1', 'book_rec_type', '小说推荐类型', 1, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('本周强推', '2', 'book_rec_type', '小说推荐类型', 2, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('热门推荐', '3', 'book_rec_type', '小说推荐类型', 3, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('精品推荐', '4', 'book_rec_type', '小说推荐类型', 4, null, null, null, null, null, '', null);
+
+
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (320, '300', '小说推荐', 'novel/bookSetting', 'novel:bookSetting:bookSetting', '1', 'fa', '6');
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (321, '320', '查看', null, 'novel:bookSetting:detail', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (322, '320', '新增', null, 'novel:bookSetting:add', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (323, '320', '修改', null, 'novel:bookSetting:edit', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (324, '320', '删除', null, 'novel:bookSetting:remove', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (325, '320', '批量删除', null, 'novel:bookSetting:batchRemove', '2', null, '6');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 320);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 321);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 322);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 323);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 324);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 325);
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (410, '400', '会员反馈', 'novel/userFeedback', 'novel:userFeedback:userFeedback', '1', 'fa', '16');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 410);
+
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (305, '301', '修改', null, 'novel:websiteInfo:edit', '2', null, '6');
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 305);

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>4.0.0</version>
+    <version>4.2.0</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.8.RELEASE</version>
+        <version>2.1.18.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -25,6 +25,7 @@
         <velocity.version>1.7</velocity.version>
         <activiti.version>5.22.0</activiti.version>
         <sharding.jdbc.version>3.0.0</sharding.jdbc.version>
+        <jackson.version>2.15.1</jackson.version>
     </properties>
 
     <dependencies>
@@ -63,12 +64,12 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.11</version>
+            <version>8.0.29</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.4.4</version>
+            <version>3.5.6</version>
         </dependency>
 
         <dependency>
@@ -80,7 +81,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>1.0.28</version>
+            <version>1.2.9</version>
         </dependency>
         <!--commons -->
         <dependency>
@@ -96,18 +97,18 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.5</version>
+            <version>2.9.0</version>
         </dependency>
         <!--shiro -->
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
-            <version>1.3.2</version>
+            <version>1.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring</artifactId>
-            <version>1.7.0</version>
+            <version>1.11.0</version>
         </dependency>
         <!-- shiro ehcache -->
         <dependency>
@@ -119,7 +120,7 @@
                     <artifactId>ehcache-core</artifactId>
                 </exclusion>
             </exclusions>
-            <version>1.4.0</version>
+            <version>1.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.theborakompanioni</groupId>
@@ -130,7 +131,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.31</version>
+            <version>1.2.83</version>
         </dependency>
         <!--velocity代码生成使用模板 -->
         <dependency>
@@ -208,6 +209,12 @@
             <version>${sharding.jdbc.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
         <!--war包部署需要-->
         <!--<dependency>-->
         <!--<groupId>org.springframework.boot</groupId>-->

novel-admin/src/main/java/com/java2nb/novel/controller/BookSettingController.java

@@ -0,0 +1,134 @@
+package com.java2nb.novel.controller;
+
+import com.java2nb.common.config.CacheKey;
+import com.java2nb.common.utils.PageBean;
+import com.java2nb.common.utils.Query;
+import com.java2nb.common.utils.R;
+import com.java2nb.novel.domain.BookSettingDO;
+import com.java2nb.novel.service.BookSettingService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 首页小说推荐
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-18 10:01:13
+ */
+
+@Controller
+@RequestMapping("/novel/bookSetting")
+public class BookSettingController {
+
+    @Autowired
+    private BookSettingService bookSettingService;
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    @GetMapping()
+    @RequiresPermissions("novel:bookSetting:bookSetting")
+    String BookSetting() {
+        return "novel/bookSetting/bookSetting";
+    }
+
+    @ApiOperation(value = "获取首页小说设置表列表", notes = "获取首页小说设置表列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:bookSetting:bookSetting")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<BookSettingDO> bookSettingList = bookSettingService.list(query);
+        int total = bookSettingService.count(query);
+        PageBean pageBean = new PageBean(bookSettingList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增首页小说设置表页面", notes = "新增首页小说设置表页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:bookSetting:add")
+    String add() {
+        return "novel/bookSetting/add";
+    }
+
+    @ApiOperation(value = "修改首页小说设置表页面", notes = "修改首页小说设置表页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:bookSetting:edit")
+    String edit(@PathVariable("id") Long id, Model model) {
+        BookSettingDO bookSetting = bookSettingService.get(id);
+        model.addAttribute("bookSetting", bookSetting);
+        return "novel/bookSetting/edit";
+    }
+
+    @ApiOperation(value = "查看首页小说设置表页面", notes = "查看首页小说设置表页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:bookSetting:detail")
+    String detail(@PathVariable("id") Long id, Model model) {
+        BookSettingDO bookSetting = bookSettingService.get(id);
+        model.addAttribute("bookSetting", bookSetting);
+        return "novel/bookSetting/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增首页小说设置表", notes = "新增首页小说设置表")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:bookSetting:add")
+    public R save(BookSettingDO bookSetting) {
+        if (bookSettingService.save(bookSetting) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改首页小说设置表", notes = "修改首页小说设置表")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:bookSetting:edit")
+    public R update(BookSettingDO bookSetting) {
+        bookSettingService.update(bookSetting);
+        redisTemplate.delete(CacheKey.INDEX_BOOK_SETTINGS_KEY);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除首页小说设置表", notes = "删除首页小说设置表")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:bookSetting:remove")
+    public R remove(Long id) {
+        if (bookSettingService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除首页小说设置表", notes = "批量删除首页小说设置表")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:bookSetting:batchRemove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+        bookSettingService.batchRemove(ids);
+        return R.ok();
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/controller/NewsController.java

@@ -1,26 +1,21 @@
 package com.java2nb.novel.controller;
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import io.swagger.annotations.ApiOperation;
-
-
-import com.java2nb.novel.domain.NewsDO;
-import com.java2nb.novel.service.NewsService;
+import com.java2nb.common.config.CacheKey;
 import com.java2nb.common.utils.PageBean;
 import com.java2nb.common.utils.Query;
 import com.java2nb.common.utils.R;
+import com.java2nb.novel.domain.NewsDO;
+import com.java2nb.novel.service.NewsService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 新闻表
@@ -33,8 +28,11 @@ import com.java2nb.common.utils.R;
 @Controller
 @RequestMapping("/novel/news")
 public class NewsController {
+
     @Autowired
     private NewsService newsService;
+    @Autowired
+    private RedisTemplate<Object, Object> redisTemplate;
 
     @GetMapping()
     @RequiresPermissions("novel:news:news")
@@ -66,7 +64,7 @@ public class NewsController {
     @GetMapping("/edit/{id}")
     @RequiresPermissions("novel:news:edit")
     String edit(@PathVariable("id") Long id, Model model) {
-            NewsDO news = newsService.get(id);
+        NewsDO news = newsService.get(id);
         model.addAttribute("news", news);
         return "novel/news/edit";
     }
@@ -75,7 +73,7 @@ public class NewsController {
     @GetMapping("/detail/{id}")
     @RequiresPermissions("novel:news:detail")
     String detail(@PathVariable("id") Long id, Model model) {
-			NewsDO news = newsService.get(id);
+        NewsDO news = newsService.get(id);
         model.addAttribute("news", news);
         return "novel/news/detail";
     }
@@ -87,8 +85,9 @@ public class NewsController {
     @ResponseBody
     @PostMapping("/save")
     @RequiresPermissions("novel:news:add")
-    public R save( NewsDO news) {
+    public R save(NewsDO news) {
         if (newsService.save(news) > 0) {
+            redisTemplate.delete(CacheKey.INDEX_NEWS_KEY);
             return R.ok();
         }
         return R.error();
@@ -101,8 +100,9 @@ public class NewsController {
     @ResponseBody
     @RequestMapping("/update")
     @RequiresPermissions("novel:news:edit")
-    public R update( NewsDO news) {
-            newsService.update(news);
+    public R update(NewsDO news) {
+        newsService.update(news);
+        redisTemplate.delete(CacheKey.INDEX_NEWS_KEY);
         return R.ok();
     }
 
@@ -113,8 +113,9 @@ public class NewsController {
     @PostMapping("/remove")
     @ResponseBody
     @RequiresPermissions("novel:news:remove")
-    public R remove( Long id) {
+    public R remove(Long id) {
         if (newsService.remove(id) > 0) {
+            redisTemplate.delete(CacheKey.INDEX_NEWS_KEY);
             return R.ok();
         }
         return R.error();
@@ -128,7 +129,8 @@ public class NewsController {
     @ResponseBody
     @RequiresPermissions("novel:news:batchRemove")
     public R remove(@RequestParam("ids[]") Long[] ids) {
-            newsService.batchRemove(ids);
+        newsService.batchRemove(ids);
+        redisTemplate.delete(CacheKey.INDEX_NEWS_KEY);
         return R.ok();
     }
 

novel-admin/src/main/java/com/java2nb/novel/controller/UserFeedbackController.java

@@ -0,0 +1,135 @@
+package com.java2nb.novel.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import io.swagger.annotations.ApiOperation;
+
+
+import com.java2nb.novel.domain.UserFeedbackDO;
+import com.java2nb.novel.service.UserFeedbackService;
+import com.java2nb.common.utils.PageBean;
+import com.java2nb.common.utils.Query;
+import com.java2nb.common.utils.R;
+
+/**
+ * 
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-18 11:08:54
+ */
+
+@Controller
+@RequestMapping("/novel/userFeedback")
+public class UserFeedbackController {
+    @Autowired
+    private UserFeedbackService userFeedbackService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:userFeedback:userFeedback")
+    String UserFeedback() {
+        return "novel/userFeedback/userFeedback";
+    }
+
+    @ApiOperation(value = "获取列表", notes = "获取列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:userFeedback:userFeedback")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<UserFeedbackDO> userFeedbackList = userFeedbackService.list(query);
+        int total = userFeedbackService.count(query);
+        PageBean pageBean = new PageBean(userFeedbackList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增页面", notes = "新增页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:userFeedback:add")
+    String add() {
+        return "novel/userFeedback/add";
+    }
+
+    @ApiOperation(value = "修改页面", notes = "修改页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:userFeedback:edit")
+    String edit(@PathVariable("id") Long id, Model model) {
+            UserFeedbackDO userFeedback = userFeedbackService.get(id);
+        model.addAttribute("userFeedback", userFeedback);
+        return "novel/userFeedback/edit";
+    }
+
+    @ApiOperation(value = "查看页面", notes = "查看页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:userFeedback:detail")
+    String detail(@PathVariable("id") Long id, Model model) {
+			UserFeedbackDO userFeedback = userFeedbackService.get(id);
+        model.addAttribute("userFeedback", userFeedback);
+        return "novel/userFeedback/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增", notes = "新增")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:userFeedback:add")
+    public R save( UserFeedbackDO userFeedback) {
+        if (userFeedbackService.save(userFeedback) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改", notes = "修改")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:userFeedback:edit")
+    public R update( UserFeedbackDO userFeedback) {
+            userFeedbackService.update(userFeedback);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除", notes = "删除")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:userFeedback:remove")
+    public R remove( Long id) {
+        if (userFeedbackService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除", notes = "批量删除")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:userFeedback:batchRemove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+            userFeedbackService.batchRemove(ids);
+        return R.ok();
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/controller/WebsiteInfoController.java

@@ -28,7 +28,7 @@ public class WebsiteInfoController {
     private WebsiteInfoService websiteInfoService;
 
     @GetMapping()
-    @RequiresPermissions("novel:websiteInfo:detail")
+    @RequiresPermissions("novel:websiteInfo:websiteInfo")
     String detail(Model model) {
         WebsiteInfoDO websiteInfo = websiteInfoService.get(1L);
         model.addAttribute("websiteInfo", websiteInfo);

novel-admin/src/main/java/com/java2nb/novel/dao/BookSettingDao.java

@@ -0,0 +1,32 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.BookSettingDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 首页小说设置表
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-18 10:01:13
+ */
+@Mapper
+public interface BookSettingDao {
+
+	BookSettingDO get(Long id);
+	
+	List<BookSettingDO> list(Map<String,Object> map);
+	
+	int count(Map<String,Object> map);
+	
+	int save(BookSettingDO bookSetting);
+	
+	int update(BookSettingDO bookSetting);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}

novel-admin/src/main/java/com/java2nb/novel/dao/UserFeedbackDao.java

@@ -0,0 +1,32 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.UserFeedbackDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-18 11:08:54
+ */
+@Mapper
+public interface UserFeedbackDao {
+
+	UserFeedbackDO get(Long id);
+	
+	List<UserFeedbackDO> list(Map<String,Object> map);
+	
+	int count(Map<String,Object> map);
+	
+	int save(UserFeedbackDO userFeedback);
+	
+	int update(UserFeedbackDO userFeedback);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}

novel-admin/src/main/java/com/java2nb/novel/domain/BookSettingDO.java

@@ -0,0 +1,175 @@
+package com.java2nb.novel.domain;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.java2nb.common.jsonserializer.LongToStringSerializer;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 首页小说设置表
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-18 10:01:13
+ */
+public class BookSettingDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    //
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long id;
+    //小说ID
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long bookId;
+    //排序号
+    private Integer sort;
+    //类型，0：轮播图，1：顶部小说栏设置，2：本周强推，3：热门推荐，4：精品推荐
+    private Integer type;
+    //创建时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    //创建人ID
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long createUserId;
+    //更新时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    //更新人ID
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long updateUserId;
+
+    private String bookName;
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    /**
+     * 设置：
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 设置：小说ID
+     */
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    /**
+     * 获取：小说ID
+     */
+    public Long getBookId() {
+        return bookId;
+    }
+
+    /**
+     * 设置：排序号
+     */
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    /**
+     * 获取：排序号
+     */
+    public Integer getSort() {
+        return sort;
+    }
+
+    /**
+     * 设置：类型，0：轮播图，1：顶部小说栏设置，2：本周强推，3：热门推荐，4：精品推荐
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    /**
+     * 获取：类型，0：轮播图，1：顶部小说栏设置，2：本周强推，3：热门推荐，4：精品推荐
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置：创建人ID
+     */
+    public void setCreateUserId(Long createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    /**
+     * 获取：创建人ID
+     */
+    public Long getCreateUserId() {
+        return createUserId;
+    }
+
+    /**
+     * 设置：更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取：更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置：更新人ID
+     */
+    public void setUpdateUserId(Long updateUserId) {
+        this.updateUserId = updateUserId;
+    }
+
+    /**
+     * 获取：更新人ID
+     */
+    public Long getUpdateUserId() {
+        return updateUserId;
+    }
+}

novel-admin/src/main/java/com/java2nb/novel/domain/UserFeedbackDO.java

@@ -0,0 +1,103 @@
+package com.java2nb.novel.domain;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.java2nb.common.jsonserializer.LongToStringSerializer;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-18 11:08:54
+ */
+public class UserFeedbackDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    //主键id
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long id;
+    //用户id
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long userId;
+    //反馈内容
+    private String content;
+    //反馈时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    private String userName;
+
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    /**
+     * 设置：主键id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：主键id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 设置：用户id
+     */
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取：用户id
+     */
+    public Long getUserId() {
+        return userId;
+    }
+
+    /**
+     * 设置：反馈内容
+     */
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    /**
+     * 获取：反馈内容
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * 设置：反馈时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：反馈时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+}

novel-admin/src/main/java/com/java2nb/novel/service/BookSettingService.java

@@ -0,0 +1,30 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.BookSettingDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 首页小说设置表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-18 10:01:13
+ */
+public interface BookSettingService {
+	
+	BookSettingDO get(Long id);
+	
+	List<BookSettingDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(BookSettingDO bookSetting);
+	
+	int update(BookSettingDO bookSetting);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}

novel-admin/src/main/java/com/java2nb/novel/service/UserFeedbackService.java

@@ -0,0 +1,30 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.UserFeedbackDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-18 11:08:54
+ */
+public interface UserFeedbackService {
+	
+	UserFeedbackDO get(Long id);
+	
+	List<UserFeedbackDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(UserFeedbackDO userFeedback);
+	
+	int update(UserFeedbackDO userFeedback);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}

novel-admin/src/main/java/com/java2nb/novel/service/impl/BookSettingServiceImpl.java

@@ -0,0 +1,67 @@
+package com.java2nb.novel.service.impl;
+
+import com.java2nb.novel.dao.BookDao;
+import com.java2nb.novel.dao.BookSettingDao;
+import com.java2nb.novel.domain.BookDO;
+import com.java2nb.novel.domain.BookSettingDO;
+import com.java2nb.novel.service.BookSettingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+@Service
+public class BookSettingServiceImpl implements BookSettingService {
+
+    @Autowired
+    private BookSettingDao bookSettingDao;
+    @Autowired
+    private BookDao bookDao;
+
+    @Override
+    public BookSettingDO get(Long id) {
+        return bookSettingDao.get(id);
+    }
+
+    @Override
+    public List<BookSettingDO> list(Map<String, Object> map) {
+        List<BookSettingDO> list = bookSettingDao.list(map);
+        if (!CollectionUtils.isEmpty(list)) {
+            List<Long> bookIds = list.stream().map(BookSettingDO::getBookId).collect(Collectors.toList());
+            Map<Long, String> bookNameMap = bookDao.batchGet(bookIds).stream()
+                .collect(Collectors.toMap(BookDO::getId, BookDO::getBookName));
+            list.forEach(v -> v.setBookName(bookNameMap.get(v.getBookId())));
+        }
+        return list;
+    }
+
+    @Override
+    public int count(Map<String, Object> map) {
+        return bookSettingDao.count(map);
+    }
+
+    @Override
+    public int save(BookSettingDO bookSetting) {
+        return bookSettingDao.save(bookSetting);
+    }
+
+    @Override
+    public int update(BookSettingDO bookSetting) {
+        return bookSettingDao.update(bookSetting);
+    }
+
+    @Override
+    public int remove(Long id) {
+        return bookSettingDao.remove(id);
+    }
+
+    @Override
+    public int batchRemove(Long[] ids) {
+        return bookSettingDao.batchRemove(ids);
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/service/impl/UserFeedbackServiceImpl.java

@@ -0,0 +1,67 @@
+package com.java2nb.novel.service.impl;
+
+import com.java2nb.novel.dao.UserDao;
+import com.java2nb.novel.dao.UserFeedbackDao;
+import com.java2nb.novel.domain.UserDO;
+import com.java2nb.novel.domain.UserFeedbackDO;
+import com.java2nb.novel.service.UserFeedbackService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+@Service
+public class UserFeedbackServiceImpl implements UserFeedbackService {
+
+    @Autowired
+    private UserFeedbackDao userFeedbackDao;
+    @Autowired
+    private UserDao userDao;
+
+    @Override
+    public UserFeedbackDO get(Long id) {
+        return userFeedbackDao.get(id);
+    }
+
+    @Override
+    public List<UserFeedbackDO> list(Map<String, Object> map) {
+        List<UserFeedbackDO> list = userFeedbackDao.list(map);
+        if (!CollectionUtils.isEmpty(list)) {
+            List<Long> userIds = list.stream().map(UserFeedbackDO::getUserId).collect(Collectors.toList());
+            Map<Long, String> userNameMap = userDao.batchGet(userIds).stream()
+                .collect(Collectors.toMap(UserDO::getId, UserDO::getUsername));
+            list.forEach(v -> v.setUserName(userNameMap.get(v.getUserId())));
+        }
+        return list;
+    }
+
+    @Override
+    public int count(Map<String, Object> map) {
+        return userFeedbackDao.count(map);
+    }
+
+    @Override
+    public int save(UserFeedbackDO userFeedback) {
+        return userFeedbackDao.save(userFeedback);
+    }
+
+    @Override
+    public int update(UserFeedbackDO userFeedback) {
+        return userFeedbackDao.update(userFeedback);
+    }
+
+    @Override
+    public int remove(Long id) {
+        return userFeedbackDao.remove(id);
+    }
+
+    @Override
+    public int batchRemove(Long[] ids) {
+        return userFeedbackDao.batchRemove(ids);
+    }
+
+}

novel-admin/src/main/resources/mybatis/novel/BookSettingMapper.xml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.java2nb.novel.dao.BookSettingDao">
+
+    <select id="get" resultType="com.java2nb.novel.domain.BookSettingDO">
+        select `id`,
+               `book_id`,
+               `sort`,
+               `type`,
+               `create_time`,
+               `create_user_id`,
+               `update_time`,
+               `update_user_id`
+        from book_setting
+        where id = #{value}
+    </select>
+
+    <select id="list" resultType="com.java2nb.novel.domain.BookSettingDO">
+        select `id`,`book_id`,`sort`,`type`,`create_time`,`create_user_id`,`update_time`,`update_user_id` from
+        book_setting
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="bookId != null and bookId != ''">and book_id = #{bookId}</if>
+            <if test="sort != null and sort != ''">and sort = #{sort}</if>
+            <if test="type != null and type != ''">and type = #{type}</if>
+            <if test="createTime != null and createTime != ''">and create_time = #{createTime}</if>
+            <if test="createUserId != null and createUserId != ''">and create_user_id = #{createUserId}</if>
+            <if test="updateTime != null and updateTime != ''">and update_time = #{updateTime}</if>
+            <if test="updateUserId != null and updateUserId != ''">and update_user_id = #{updateUserId}</if>
+        </where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+            <otherwise>
+                order by id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>
+
+    <select id="count" resultType="int">
+        select count(*) from book_setting t1 inner join book t2 on t1.book_id = t2.id
+        <where>
+            <if test="id != null and id != ''">and t1.id = #{id}</if>
+            <if test="bookId != null and bookId != ''">and t1.book_id = #{bookId}</if>
+            <if test="sort != null and sort != ''">and t1.sort = #{sort}</if>
+            <if test="type != null and type != ''">and t1.type = #{type}</if>
+            <if test="createTime != null and createTime != ''">and t1.create_time = #{createTime}</if>
+            <if test="createUserId != null and createUserId != ''">and t1.create_user_id = #{createUserId}</if>
+            <if test="updateTime != null and updateTime != ''">and t1.update_time = #{updateTime}</if>
+            <if test="updateUserId != null and updateUserId != ''">and t1.update_user_id = #{updateUserId}</if>
+        </where>
+    </select>
+
+    <insert id="save" parameterType="com.java2nb.novel.domain.BookSettingDO">
+        insert into book_setting
+        (`id`,
+         `book_id`,
+         `sort`,
+         `type`,
+         `create_time`,
+         `create_user_id`,
+         `update_time`,
+         `update_user_id`)
+        values (#{id},
+                #{bookId},
+                #{sort},
+                #{type},
+                #{createTime},
+                #{createUserId},
+                #{updateTime},
+                #{updateUserId})
+    </insert>
+
+    <insert id="saveSelective" parameterType="com.java2nb.novel.domain.BookSettingDO">
+        insert into book_setting
+        (
+        <if test="id != null">`id`,</if>
+        <if test="bookId != null">`book_id`,</if>
+        <if test="sort != null">`sort`,</if>
+        <if test="type != null">`type`,</if>
+        <if test="createTime != null">`create_time`,</if>
+        <if test="createUserId != null">`create_user_id`,</if>
+        <if test="updateTime != null">`update_time`,</if>
+        <if test="updateUserId != null">`update_user_id`</if>
+        )
+        values
+        (
+        <if test="id != null">#{id},</if>
+        <if test="bookId != null">#{bookId},</if>
+        <if test="sort != null">#{sort},</if>
+        <if test="type != null">#{type},</if>
+        <if test="createTime != null">#{createTime},</if>
+        <if test="createUserId != null">#{createUserId},</if>
+        <if test="updateTime != null">#{updateTime},</if>
+        <if test="updateUserId != null">#{updateUserId}</if>
+        )
+    </insert>
+
+    <update id="update" parameterType="com.java2nb.novel.domain.BookSettingDO">
+        update book_setting
+        <set>
+            <if test="bookId != null">`book_id` = #{bookId},</if>
+            <if test="sort != null">`sort` = #{sort},</if>
+            <if test="type != null">`type` = #{type},</if>
+            <if test="createTime != null">`create_time` = #{createTime},</if>
+            <if test="createUserId != null">`create_user_id` = #{createUserId},</if>
+            <if test="updateTime != null">`update_time` = #{updateTime},</if>
+            <if test="updateUserId != null">`update_user_id` = #{updateUserId}</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <delete id="remove">
+        delete
+        from book_setting
+        where id = #{value}
+    </delete>
+
+    <delete id="batchRemove">
+        delete from book_setting where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

novel-admin/src/main/resources/mybatis/novel/UserFeedbackMapper.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.java2nb.novel.dao.UserFeedbackDao">
+
+	<select id="get" resultType="com.java2nb.novel.domain.UserFeedbackDO">
+		select `id`,`user_id`,`content`,`create_time` from user_feedback where id = #{value}
+	</select>
+
+	<select id="list" resultType="com.java2nb.novel.domain.UserFeedbackDO">
+		select `id`,`user_id`,`content`,`create_time` from user_feedback
+        <where>  
+		  		  <if test="id != null and id != ''"> and id = #{id} </if>
+		  		  <if test="userId != null and userId != ''"> and user_id = #{userId} </if>
+		  		  <if test="content != null and content != ''"> and content = #{content} </if>
+		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
+		  		</where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+			<otherwise>
+                order by id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="count" resultType="int">
+		select count(*) from user_feedback
+		 <where>  
+		  		  <if test="id != null and id != ''"> and id = #{id} </if>
+		  		  <if test="userId != null and userId != ''"> and user_id = #{userId} </if>
+		  		  <if test="content != null and content != ''"> and content = #{content} </if>
+		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
+		  		</where>
+	</select>
+	 
+	<insert id="save" parameterType="com.java2nb.novel.domain.UserFeedbackDO">
+		insert into user_feedback
+		(
+			`id`, 
+			`user_id`, 
+			`content`, 
+			`create_time`
+		)
+		values
+		(
+			#{id}, 
+			#{userId}, 
+			#{content}, 
+			#{createTime}
+		)
+	</insert>
+
+	<insert id="saveSelective" parameterType="com.java2nb.novel.domain.UserFeedbackDO">
+		insert into user_feedback
+		(
+					<if test="id != null"> `id`,  </if>
+					<if test="userId != null"> `user_id`,  </if>
+					<if test="content != null"> `content`,  </if>
+					<if test="createTime != null"> `create_time` </if>
+				)
+		values
+		(
+					<if test="id != null"> #{id},  </if>
+					<if test="userId != null"> #{userId},  </if>
+					<if test="content != null"> #{content},  </if>
+					<if test="createTime != null"> #{createTime} </if>
+				)
+	</insert>
+	 
+	<update id="update" parameterType="com.java2nb.novel.domain.UserFeedbackDO">
+		update user_feedback 
+		<set>
+			<if test="userId != null">`user_id` = #{userId}, </if>
+			<if test="content != null">`content` = #{content}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}</if>
+		</set>
+		where id = #{id}
+	</update>
+	
+	<delete id="remove">
+		delete from user_feedback where id = #{value}
+	</delete>
+	
+	<delete id="batchRemove">
+		delete from user_feedback where id in 
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+</mapper>

novel-admin/src/main/resources/static/js/appjs/novel/book/book.js

@@ -50,9 +50,6 @@ function load() {
                     }
                 },
                 columns: [
-                    {
-                        checkbox: true
-                    },
                     {
                         title: '序号',
                         formatter: function () {
@@ -60,6 +57,11 @@ function load() {
                         }
                     },
 
+                    {
+                        field: 'id',
+                        title: '小说ID'
+                    },
+
                     {
                         field: 'workDirection',
                         title: '作品方向',

novel-admin/src/main/resources/static/js/appjs/novel/bookSetting/add.js

@@ -0,0 +1,119 @@
+var E = window.wangEditor;
+$("[id^='contentEditor']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(13);
+    var editor = new E('#contentEditor' + relName);
+// 自定义菜单配置
+    editor.customConfig.menus = [
+        'head',  // 标题
+        'bold',  // 粗体
+        'fontSize',  // 字号
+        'fontName',  // 字体
+        'italic',  // 斜体
+        'underline',  // 下划线
+        'strikeThrough',  // 删除线
+        'foreColor',  // 文字颜色
+        //'backColor',  // 背景颜色
+        //'link',  // 插入链接
+        'list',  // 列表
+        'justify',  // 对齐方式
+        'quote',  // 引用
+        'emoticon',  // 表情
+        'image',  // 插入图片
+        //'table',  // 表格
+        //'video',  // 插入视频
+        //'code',  // 插入代码
+        'undo',  // 撤销
+        'redo'  // 重复
+    ];
+    editor.customConfig.onchange = function (html) {
+        // html 即变化之后的内容
+        $("#" + relName).val(html);
+    }
+    editor.customConfig.uploadImgShowBase64 = true;
+    editor.create();
+
+})
+
+$("[id^='picImage']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(8);
+    layui.use('upload', function () {
+        var upload = layui.upload;
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#picImage' + relName, //绑定元素
+            url: '/common/sysFile/upload', //上传接口
+            size: 1000,
+            accept: 'file',
+            done: function (r) {
+                $("#picImage" + relName).attr("src", r.fileName);
+                $("#" + relName).val(r.fileName);
+            },
+            error: function (r) {
+                layer.msg(r.msg);
+            }
+        });
+    });
+
+});
+
+
+
+
+
+
+$().ready(function () {
+    validateRule();
+});
+
+$.validator.setDefaults({
+    submitHandler: function () {
+        save();
+    }
+});
+function save() {
+    $.ajax({
+        cache: true,
+        type: "POST",
+        url: "/novel/bookSetting/save",
+        data: $('#signupForm').serialize(),// 你的formid
+        async: false,
+        error: function (request) {
+            parent.layer.alert("Connection error");
+        },
+        success: function (data) {
+            if (data.code == 0) {
+                parent.layer.msg("操作成功");
+                parent.reLoad();
+                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(index);
+
+            } else {
+                parent.layer.alert(data.msg)
+            }
+
+        }
+    });
+
+}
+function validateRule() {
+    var icon = "<i class='fa fa-times-circle'></i> ";
+        $("#signupForm").validate({
+            ignore: "",
+            rules: {
+                                    bookId: {
+                required: true
+            },                                 sort: {
+                required: true
+            },                                 type: {
+                required: true
+            },                                                                 },
+    messages: {
+                                                        bookId: {
+                required: icon + "请选择小说ID"
+            },                                                 sort: {
+                required: icon + "请选择排序号"
+            },                                                 type: {
+                required: icon + "请选择推荐类型"
+            },                                                                                                         }
+})
+}

novel-admin/src/main/resources/static/js/appjs/novel/bookSetting/bookSetting.js

@@ -0,0 +1,191 @@
+var prefix = "/novel/bookSetting"
+$(function () {
+    load();
+});
+
+function load() {
+    $('#exampleTable')
+        .bootstrapTable(
+            {
+                method: 'get', // 服务器数据的请求方式 get or post
+                url: prefix + "/list", // 服务器数据的加载地址
+                //	showRefresh : true,
+                //	showToggle : true,
+                //	showColumns : true,
+                iconSize: 'outline',
+                toolbar: '#exampleToolbar',
+                striped: true, // 设置为true会有隔行变色效果
+                dataType: "json", // 服务器返回的数据类型
+                pagination: true, // 设置为true会在底部显示分页条
+                // queryParamsType : "limit",
+                // //设置为limit则会发送符合RESTFull格式的参数
+                singleSelect: false, // 设置为true将禁止多选
+                // contentType : "application/x-www-form-urlencoded",
+                // //发送到服务器的数据编码类型
+                pageSize: 10, // 如果设置了分页，每页数据条数
+                pageNumber: 1, // 如果设置了分布，首页页码
+                //search : true, // 是否显示搜索框
+                showColumns: false, // 是否显示内容下拉框（选择显示的列）
+                sidePagination: "server", // 设置在哪里进行分页，可选值为"client" 或者 "server"
+                queryParams: function (params) {
+                    //说明：传入后台的参数包括offset开始索引，limit步长，sort排序列，order：desc或者,以及所有列的键值对
+                    var queryParams = getFormJson("searchForm");
+                    queryParams.limit = params.limit;
+                    queryParams.offset = params.offset;
+                    return queryParams;
+                },
+                // //请求服务器数据时，你可以通过重写参数的方式添加一些额外的参数，例如 toolbar 中的参数 如果
+                // queryParamsType = 'limit' ,返回参数必须包含
+                // limit, offset, search, sort, order 否则, 需要包含:
+                // pageSize, pageNumber, searchText, sortName,
+                // sortOrder.
+                // 返回false将会终止请求
+                responseHandler: function (rs) {
+
+                    if (rs.code == 0) {
+                        return rs.data;
+                    } else {
+                        parent.layer.alert(rs.msg)
+                        return {total: 0, rows: []};
+                    }
+                },
+                columns: [
+                    {
+                        title: '序号',
+                        formatter: function () {
+                            return arguments[2] + 1;
+                        }
+                    },
+                    {
+                        field: 'bookId',
+                        title: '小说ID'
+                    },
+                    {
+                        field: 'bookName',
+                        title: '小说名'
+                    },
+                    {
+                        field: 'type',
+                        title: '推荐类型',
+                        formatter: function (value, row, index) {
+                            return formatDict("book_rec_type", value);
+                        }
+                    },
+                    {
+                        field: 'sort',
+                        title: '排序号'
+                    },
+
+                    {
+                        title: '操作',
+                        field: 'id',
+                        align: 'center',
+                        formatter: function (value, row, index) {
+                            var d = '<a class="btn btn-primary btn-sm ' + s_detail_h + '" href="#" mce_href="#" title="详情" onclick="detail(\''
+                                + row.id
+                                + '\')"><i class="fa fa-file"></i></a> ';
+                            var e = '<a class="btn btn-primary btn-sm ' + s_edit_h + '" href="#" mce_href="#" title="编辑" onclick="edit(\''
+                                + row.id
+                                + '\')"><i class="fa fa-edit"></i></a> ';
+                            return d + e;
+                        }
+                    }]
+            });
+}
+
+function reLoad() {
+    $('#exampleTable').bootstrapTable('refresh');
+}
+
+function add() {
+    layer.open({
+        type: 2,
+        title: '增加',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/add' // iframe的url
+    });
+}
+
+function detail(id) {
+    layer.open({
+        type: 2,
+        title: '详情',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/detail/' + id // iframe的url
+    });
+}
+
+function edit(id) {
+    layer.open({
+        type: 2,
+        title: '编辑',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/edit/' + id // iframe的url
+    });
+}
+
+function remove(id) {
+    layer.confirm('确定要删除选中的记录？', {
+        btn: ['确定', '取消']
+    }, function () {
+        $.ajax({
+            url: prefix + "/remove",
+            type: "post",
+            data: {
+                'id': id
+            },
+            success: function (r) {
+                if (r.code == 0) {
+                    layer.msg(r.msg);
+                    reLoad();
+                } else {
+                    layer.msg(r.msg);
+                }
+            }
+        });
+    })
+}
+
+function resetPwd(id) {
+}
+
+function batchRemove() {
+    var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行，当没有选择的记录时，返回一个空数组
+    if (rows.length == 0) {
+        layer.msg("请选择要删除的数据");
+        return;
+    }
+    layer.confirm("确认要删除选中的'" + rows.length + "'条数据吗?", {
+        btn: ['确定', '取消']
+        // 按钮
+    }, function () {
+        var ids = new Array();
+        // 遍历所有选择的行数据，取每条数据对应的ID
+        $.each(rows, function (i, row) {
+            ids[i] = row['id'];
+        });
+        $.ajax({
+            type: 'POST',
+            data: {
+                "ids": ids
+            },
+            url: prefix + '/batchRemove',
+            success: function (r) {
+                if (r.code == 0) {
+                    layer.msg(r.msg);
+                    reLoad();
+                } else {
+                    layer.msg(r.msg);
+                }
+            }
+        });
+    }, function () {
+
+    });
+}

novel-admin/src/main/resources/static/js/appjs/novel/bookSetting/edit.js

@@ -0,0 +1,121 @@
+var E = window.wangEditor;
+$("[id^='contentEditor']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(13);
+    var editor = new E('#contentEditor' + relName);
+// 自定义菜单配置
+    editor.customConfig.menus = [
+        'head',  // 标题
+        'bold',  // 粗体
+        'fontSize',  // 字号
+        'fontName',  // 字体
+        'italic',  // 斜体
+        'underline',  // 下划线
+        'strikeThrough',  // 删除线
+        'foreColor',  // 文字颜色
+        //'backColor',  // 背景颜色
+        //'link',  // 插入链接
+        'list',  // 列表
+        'justify',  // 对齐方式
+        'quote',  // 引用
+        'emoticon',  // 表情
+        'image',  // 插入图片
+        //'table',  // 表格
+        //'video',  // 插入视频
+        //'code',  // 插入代码
+        'undo',  // 撤销
+        'redo'  // 重复
+    ];
+    editor.customConfig.onchange = function (html) {
+        // html 即变化之后的内容
+        $("#" + relName).val(html);
+    }
+    editor.customConfig.uploadImgShowBase64 = true;
+    editor.create();
+    editor.txt.html($("#" + relName).val());
+
+})
+
+$("[id^='picImage']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(8);
+    layui.use('upload', function () {
+        var upload = layui.upload;
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#picImage' + relName, //绑定元素
+            url: '/common/sysFile/upload', //上传接口
+            size: 1000,
+            accept: 'file',
+            done: function (r) {
+                $("#picImage" + relName).attr("src", r.fileName);
+                $("#" + relName).val(r.fileName);
+            },
+            error: function (r) {
+                layer.msg(r.msg);
+            }
+        });
+    });
+
+});
+
+$().ready(function () {
+    validateRule();
+});
+
+$.validator.setDefaults({
+    submitHandler: function () {
+        update();
+    }
+});
+function update() {
+    $.ajax({
+        cache: true,
+        type: "POST",
+        url: "/novel/bookSetting/update",
+        data: $('#signupForm').serialize(),// 你的formid
+        async: false,
+        error: function (request) {
+            parent.layer.alert("Connection error");
+        },
+        success: function (data) {
+            if (data.code == 0) {
+                parent.layer.msg("操作成功");
+                parent.reLoad();
+                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(index);
+
+            } else {
+                parent.layer.alert(data.msg)
+            }
+
+        }
+    });
+
+}
+function validateRule() {
+    var icon = "<i class='fa fa-times-circle'></i> ";
+    $("#signupForm").validate({
+        ignore: "",
+        rules: {
+                                    bookId:
+            {
+                required: true
+            },                                 sort:
+            {
+                required: true
+            },                                 type:
+            {
+                required: true
+            },                                                             },
+    messages: {
+                                                        bookId:
+                {
+                    required: icon + "请选择小说ID"
+                },                                                 sort:
+                {
+                    required: icon + "请选择排序号"
+                },                                                 type:
+                {
+                    required: icon + "请选择推荐类型"
+                },                                                                                                         }
+})
+}

novel-admin/src/main/resources/static/js/appjs/novel/pay/pay.js

@@ -50,9 +50,6 @@ function load() {
                     }
                 },
                 columns: [
-                    {
-                        checkbox: true
-                    },
                     {
                         title: '序号',
                         formatter: function () {

novel-admin/src/main/resources/static/js/appjs/novel/user/user.js

@@ -50,9 +50,6 @@ function load() {
                     }
                 },
                 columns: [
-                    {
-                        checkbox: true
-                    },
                     {
                         title: '序号',
                         formatter: function () {

novel-admin/src/main/resources/static/js/appjs/novel/userFeedback/add.js

@@ -0,0 +1,107 @@
+var E = window.wangEditor;
+$("[id^='contentEditor']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(13);
+    var editor = new E('#contentEditor' + relName);
+// 自定义菜单配置
+    editor.customConfig.menus = [
+        'head',  // 标题
+        'bold',  // 粗体
+        'fontSize',  // 字号
+        'fontName',  // 字体
+        'italic',  // 斜体
+        'underline',  // 下划线
+        'strikeThrough',  // 删除线
+        'foreColor',  // 文字颜色
+        //'backColor',  // 背景颜色
+        //'link',  // 插入链接
+        'list',  // 列表
+        'justify',  // 对齐方式
+        'quote',  // 引用
+        'emoticon',  // 表情
+        'image',  // 插入图片
+        //'table',  // 表格
+        //'video',  // 插入视频
+        //'code',  // 插入代码
+        'undo',  // 撤销
+        'redo'  // 重复
+    ];
+    editor.customConfig.onchange = function (html) {
+        // html 即变化之后的内容
+        $("#" + relName).val(html);
+    }
+    editor.customConfig.uploadImgShowBase64 = true;
+    editor.create();
+
+})
+
+$("[id^='picImage']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(8);
+    layui.use('upload', function () {
+        var upload = layui.upload;
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#picImage' + relName, //绑定元素
+            url: '/common/sysFile/upload', //上传接口
+            size: 1000,
+            accept: 'file',
+            done: function (r) {
+                $("#picImage" + relName).attr("src", r.fileName);
+                $("#" + relName).val(r.fileName);
+            },
+            error: function (r) {
+                layer.msg(r.msg);
+            }
+        });
+    });
+
+});
+
+
+
+
+
+
+$().ready(function () {
+    validateRule();
+});
+
+$.validator.setDefaults({
+    submitHandler: function () {
+        save();
+    }
+});
+function save() {
+    $.ajax({
+        cache: true,
+        type: "POST",
+        url: "/novel/userFeedback/save",
+        data: $('#signupForm').serialize(),// 你的formid
+        async: false,
+        error: function (request) {
+            parent.layer.alert("Connection error");
+        },
+        success: function (data) {
+            if (data.code == 0) {
+                parent.layer.msg("操作成功");
+                parent.reLoad();
+                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(index);
+
+            } else {
+                parent.layer.alert(data.msg)
+            }
+
+        }
+    });
+
+}
+function validateRule() {
+    var icon = "<i class='fa fa-times-circle'></i> ";
+        $("#signupForm").validate({
+            ignore: "",
+            rules: {
+                                                        },
+    messages: {
+                                                                                            }
+})
+}

novel-admin/src/main/resources/static/js/appjs/novel/userFeedback/edit.js

@@ -0,0 +1,103 @@
+var E = window.wangEditor;
+$("[id^='contentEditor']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(13);
+    var editor = new E('#contentEditor' + relName);
+// 自定义菜单配置
+    editor.customConfig.menus = [
+        'head',  // 标题
+        'bold',  // 粗体
+        'fontSize',  // 字号
+        'fontName',  // 字体
+        'italic',  // 斜体
+        'underline',  // 下划线
+        'strikeThrough',  // 删除线
+        'foreColor',  // 文字颜色
+        //'backColor',  // 背景颜色
+        //'link',  // 插入链接
+        'list',  // 列表
+        'justify',  // 对齐方式
+        'quote',  // 引用
+        'emoticon',  // 表情
+        'image',  // 插入图片
+        //'table',  // 表格
+        //'video',  // 插入视频
+        //'code',  // 插入代码
+        'undo',  // 撤销
+        'redo'  // 重复
+    ];
+    editor.customConfig.onchange = function (html) {
+        // html 即变化之后的内容
+        $("#" + relName).val(html);
+    }
+    editor.customConfig.uploadImgShowBase64 = true;
+    editor.create();
+    editor.txt.html($("#" + relName).val());
+
+})
+
+$("[id^='picImage']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(8);
+    layui.use('upload', function () {
+        var upload = layui.upload;
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#picImage' + relName, //绑定元素
+            url: '/common/sysFile/upload', //上传接口
+            size: 1000,
+            accept: 'file',
+            done: function (r) {
+                $("#picImage" + relName).attr("src", r.fileName);
+                $("#" + relName).val(r.fileName);
+            },
+            error: function (r) {
+                layer.msg(r.msg);
+            }
+        });
+    });
+
+});
+
+$().ready(function () {
+    validateRule();
+});
+
+$.validator.setDefaults({
+    submitHandler: function () {
+        update();
+    }
+});
+function update() {
+    $.ajax({
+        cache: true,
+        type: "POST",
+        url: "/novel/userFeedback/update",
+        data: $('#signupForm').serialize(),// 你的formid
+        async: false,
+        error: function (request) {
+            parent.layer.alert("Connection error");
+        },
+        success: function (data) {
+            if (data.code == 0) {
+                parent.layer.msg("操作成功");
+                parent.reLoad();
+                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(index);
+
+            } else {
+                parent.layer.alert(data.msg)
+            }
+
+        }
+    });
+
+}
+function validateRule() {
+    var icon = "<i class='fa fa-times-circle'></i> ";
+    $("#signupForm").validate({
+        ignore: "",
+        rules: {
+                                                    },
+    messages: {
+                                                                                            }
+})
+}

novel-admin/src/main/resources/static/js/appjs/novel/userFeedback/userFeedback.js

@@ -0,0 +1,177 @@
+var prefix = "/novel/userFeedback"
+$(function () {
+    load();
+});
+
+function load() {
+    $('#exampleTable')
+        .bootstrapTable(
+            {
+                method: 'get', // 服务器数据的请求方式 get or post
+                url: prefix + "/list", // 服务器数据的加载地址
+                //	showRefresh : true,
+                //	showToggle : true,
+                //	showColumns : true,
+                iconSize: 'outline',
+                toolbar: '#exampleToolbar',
+                striped: true, // 设置为true会有隔行变色效果
+                dataType: "json", // 服务器返回的数据类型
+                pagination: true, // 设置为true会在底部显示分页条
+                // queryParamsType : "limit",
+                // //设置为limit则会发送符合RESTFull格式的参数
+                singleSelect: false, // 设置为true将禁止多选
+                // contentType : "application/x-www-form-urlencoded",
+                // //发送到服务器的数据编码类型
+                pageSize: 10, // 如果设置了分页，每页数据条数
+                pageNumber: 1, // 如果设置了分布，首页页码
+                //search : true, // 是否显示搜索框
+                showColumns: false, // 是否显示内容下拉框（选择显示的列）
+                sidePagination: "server", // 设置在哪里进行分页，可选值为"client" 或者 "server"
+                queryParams: function (params) {
+                    //说明：传入后台的参数包括offset开始索引，limit步长，sort排序列，order：desc或者,以及所有列的键值对
+                    var queryParams = getFormJson("searchForm");
+                    queryParams.limit = params.limit;
+                    queryParams.offset = params.offset;
+                    return queryParams;
+                },
+                // //请求服务器数据时，你可以通过重写参数的方式添加一些额外的参数，例如 toolbar 中的参数 如果
+                // queryParamsType = 'limit' ,返回参数必须包含
+                // limit, offset, search, sort, order 否则, 需要包含:
+                // pageSize, pageNumber, searchText, sortName,
+                // sortOrder.
+                // 返回false将会终止请求
+                responseHandler: function (rs) {
+
+                    if (rs.code == 0) {
+                        return rs.data;
+                    } else {
+                        parent.layer.alert(rs.msg)
+                        return {total: 0, rows: []};
+                    }
+                },
+                columns: [
+                    {
+                        title: '序号',
+                        formatter: function () {
+                            return arguments[2] + 1;
+                        }
+                    },
+
+                    {
+                        field: 'userName',
+                        title: '反馈用户'
+                    },
+
+
+                    {
+                        field: 'content',
+                        title: '反馈内容'
+                    },
+
+
+                    {
+                        field: 'createTime',
+                        title: '反馈时间'
+                    }
+
+
+                ]
+            });
+}
+
+function reLoad() {
+    $('#exampleTable').bootstrapTable('refresh');
+}
+
+function add() {
+    layer.open({
+        type: 2,
+        title: '增加',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/add' // iframe的url
+    });
+}
+
+function detail(id) {
+    layer.open({
+        type: 2,
+        title: '详情',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/detail/' + id // iframe的url
+    });
+}
+
+function edit(id) {
+    layer.open({
+        type: 2,
+        title: '编辑',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/edit/' + id // iframe的url
+    });
+}
+
+function remove(id) {
+    layer.confirm('确定要删除选中的记录？', {
+        btn: ['确定', '取消']
+    }, function () {
+        $.ajax({
+            url: prefix + "/remove",
+            type: "post",
+            data: {
+                'id': id
+            },
+            success: function (r) {
+                if (r.code == 0) {
+                    layer.msg(r.msg);
+                    reLoad();
+                } else {
+                    layer.msg(r.msg);
+                }
+            }
+        });
+    })
+}
+
+function resetPwd(id) {
+}
+
+function batchRemove() {
+    var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行，当没有选择的记录时，返回一个空数组
+    if (rows.length == 0) {
+        layer.msg("请选择要删除的数据");
+        return;
+    }
+    layer.confirm("确认要删除选中的'" + rows.length + "'条数据吗?", {
+        btn: ['确定', '取消']
+        // 按钮
+    }, function () {
+        var ids = new Array();
+        // 遍历所有选择的行数据，取每条数据对应的ID
+        $.each(rows, function (i, row) {
+            ids[i] = row['id'];
+        });
+        $.ajax({
+            type: 'POST',
+            data: {
+                "ids": ids
+            },
+            url: prefix + '/batchRemove',
+            success: function (r) {
+                if (r.code == 0) {
+                    layer.msg(r.msg);
+                    reLoad();
+                } else {
+                    layer.msg(r.msg);
+                }
+            }
+        });
+    }, function () {
+
+    });
+}

novel-admin/src/main/resources/static/sql/novel/bookSetting/menu.js

@@ -0,0 +1,18 @@
+-- 菜单SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    VALUES ('1', '首页小说设置表', 'novel/bookSetting', 'novel:bookSetting:bookSetting', '1', 'fa', '6');
+
+-- 按钮父菜单ID
+set @parentId = @@identity;
+
+-- 菜单对应按钮SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '查看', null, 'novel:bookSetting:detail', '2', null, '6';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '新增', null, 'novel:bookSetting:add', '2', null, '6';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '修改', null, 'novel:bookSetting:edit', '2', null, '6';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '删除', null, 'novel:bookSetting:remove', '2', null, '6';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '批量删除', null, 'novel:bookSetting:batchRemove', '2', null, '6';

novel-admin/src/main/resources/static/sql/novel/userFeedback/menu.js

@@ -0,0 +1,18 @@
+-- 菜单SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    VALUES ('1', '', 'novel/userFeedback', 'novel:userFeedback:userFeedback', '1', 'fa', '6');
+
+-- 按钮父菜单ID
+set @parentId = @@identity;
+
+-- 菜单对应按钮SQL
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '查看', null, 'novel:userFeedback:detail', '2', null, '6';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '新增', null, 'novel:userFeedback:add', '2', null, '6';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '修改', null, 'novel:userFeedback:edit', '2', null, '6';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '删除', null, 'novel:userFeedback:remove', '2', null, '6';
+INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+    SELECT @parentId, '批量删除', null, 'novel:userFeedback:batchRemove', '2', null, '6';

novel-admin/src/main/resources/templates/novel/bookSetting/add.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content ">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-content">
+                    <form class="form-horizontal m-t" id="signupForm">
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">小说ID：</label>
+                            <div class="col-sm-8">
+                                <input id="bookId" name="bookId"
+                                       class="form-control"
+                                       type="text">
+
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">排序号：</label>
+                            <div class="col-sm-8">
+                                <input id="sort" name="sort"
+                                       class="form-control"
+                                       type="text">
+
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">推荐类型：</label>
+                            <div class="col-sm-8">
+
+                                <select data-placeholder="--选择--" id="type"
+                                        name="type"
+                                        class="form-control chosen-select" tabindex="2"
+                                        dict-type="book_rec_type">
+                                </select>
+
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="col-sm-8 col-sm-offset-3">
+                                <button type="submit" class="btn btn-primary">提交</button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript" src="/wangEditor/release/wangEditor.js"></script>
+<script type="text/javascript" src="/js/appjs/novel/bookSetting/add.js">
+</script>
+</body>
+</html>

novel-admin/src/main/resources/templates/novel/bookSetting/bookSetting.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content ">
+    <div class="col-sm-12">
+        <div class="ibox">
+            <div class="ibox-body">
+                <div class="fixed-table-toolbar">
+                    <div class="columns pull-right">
+                        <button class="btn btn-success" onclick="reLoad()">查询</button>
+                    </div>
+
+                    <form id="searchForm">
+                        <div class="columns pull-right col-md-2">
+                            <select data-placeholder="--推荐类型--" id="type"
+                                    name="type"
+                                    class="form-control chosen-select" tabindex="2"
+                                    dict-type="book_rec_type">
+                            </select>
+                        </div>
+                    </form>
+
+                </div>
+                <table id="exampleTable" data-mobile-responsive="true">
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<!--shiro控制bootstraptable行内按钮看见性 -->
+<div>
+    <script type="text/javascript">
+        var s_detail_h = 'hidden';
+        var s_edit_h = 'hidden';
+        var s_remove_h = 'hidden';
+    </script>
+</div>
+<div shiro:hasPermission="test:order:detail">
+    <script type="text/javascript">
+        s_detail_h = '';
+    </script>
+</div>
+<div shiro:hasPermission="novel:bookSetting:edit">
+    <script type="text/javascript">
+        s_edit_h = '';
+    </script>
+</div>
+<div shiro:hasPermission="novel:bookSetting:remove">
+    <script type="text/javascript">
+        var s_remove_h = '';
+    </script>
+</div>
+<div th:include="include :: footer"></div>
+<script type="text/javascript" src="/js/appjs/novel/bookSetting/bookSetting.js"></script>
+</body>
+</html>

novel-admin/src/main/resources/templates/novel/bookSetting/detail.html

@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content ">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+            <div class="ibox-content">
+            <form class="form-horizontal m-t" id="signupForm">
+                <input id="id" name="id" th:value="${bookSetting.id}"
+                       type="hidden">
+                                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">小说ID：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8"
+                                 th:text="${bookSetting.bookId}">
+                            </div>
+                        
+                        
+
+                    </div>
+                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">排序号：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8"
+                                 th:text="${bookSetting.sort}">
+                            </div>
+                        
+                        
+
+                    </div>
+                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">推荐类型：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8 dict-type" dict-type="book_rec_type"
+                                 th:attr="dict-value=${bookSetting.type}">
+                            </div>
+
+                        
+
+                    </div>
+                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">创建时间：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8"
+                                 th:text="${bookSetting.createTime}==null?null:${#dates.format(bookSetting.createTime,'yyyy-MM-dd HH:mm:ss')}">
+                            </div>
+                        
+
+                    </div>
+                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">创建人ID：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8"
+                                 th:text="${bookSetting.createUserId}">
+                            </div>
+                        
+                        
+
+                    </div>
+                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">更新时间：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8"
+                                 th:text="${bookSetting.updateTime}==null?null:${#dates.format(bookSetting.updateTime,'yyyy-MM-dd HH:mm:ss')}">
+                            </div>
+                        
+
+                    </div>
+                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">更新人ID：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8"
+                                 th:text="${bookSetting.updateUserId}">
+                            </div>
+                        
+                        
+
+                    </div>
+                                                    </form>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+<div th:include="include::footer"></div>
+</body>
+</html>

novel-admin/src/main/resources/templates/novel/bookSetting/edit.html

@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content ">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-content">
+                    <form class="form-horizontal m-t" id="signupForm">
+                        <input id="id" name="id" th:value="${bookSetting.id}"
+                               type="hidden">
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">小说ID：</label>
+                            <div class="col-sm-8">
+                                <input id="bookId" name="bookId"
+                                       th:value="${bookSetting.bookId}"
+                                       class="form-control"
+                                       type="text">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">排序号：</label>
+                            <div class="col-sm-8">
+                                <input id="sort" name="sort"
+                                       th:value="${bookSetting.sort}"
+                                       class="form-control"
+                                       type="text">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">推荐类型：</label>
+                            <div class="col-sm-8">
+
+                                <select data-placeholder="--选择--" id="type" disabled
+                                        name="type"
+                                        class="form-control chosen-select" tabindex="2"
+                                        dict-type="book_rec_type"
+                                        th:attr="dict-value=${bookSetting.type}">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="col-sm-8 col-sm-offset-3">
+                                <button type="submit" class="btn btn-primary">提交</button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript" src="/wangEditor/release/wangEditor.js"></script>
+<script type="text/javascript" src="/js/appjs/novel/bookSetting/edit.js">
+</script>
+</body>
+</html>

novel-admin/src/main/resources/templates/novel/userFeedback/add.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content ">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-content">
+                    <form class="form-horizontal m-t" id="signupForm">
+                                                                                                                                        <div class="form-group">
+                                                                            <label class="col-sm-3 control-label">用户id：</label>
+                                                                        <div class="col-sm-8">
+                                                                                    <input id="userId" name="userId"
+                                                   class="form-control"
+                                                   type="text">
+                                        
+                                    </div>
+                                </div>
+                                                                                                                <div class="form-group">
+                                                                            <label class="col-sm-3 control-label">反馈内容：</label>
+                                                                        <div class="col-sm-8">
+                                                                                    <input id="content" name="content"
+                                                   class="form-control"
+                                                   type="text">
+                                        
+                                    </div>
+                                </div>
+                                                                                                                <div class="form-group">
+                                                                            <label class="col-sm-3 control-label">反馈时间：</label>
+                                                                        <div class="col-sm-8">
+                                                                                    <input type="text" class="laydate-icon layer-date form-control"
+                                                   id="createTime"
+                                                   name="createTime"
+                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
+                                                   style="background-color: #fff;" readonly="readonly"/>
+                                        
+                                    </div>
+                                </div>
+                                                                            <div class="form-group">
+                            <div class="col-sm-8 col-sm-offset-3">
+                                <button type="submit" class="btn btn-primary">提交</button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript" src="/wangEditor/release/wangEditor.js"></script>
+<script type="text/javascript" src="/js/appjs/novel/userFeedback/add.js">
+</script>
+</body>
+</html>

novel-admin/src/main/resources/templates/novel/userFeedback/detail.html

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content ">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+            <div class="ibox-content">
+            <form class="form-horizontal m-t" id="signupForm">
+                <input id="id" name="id" th:value="${userFeedback.id}"
+                       type="hidden">
+                                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">用户id：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8"
+                                 th:text="${userFeedback.userId}">
+                            </div>
+                        
+                        
+
+                    </div>
+                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">反馈内容：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8"
+                                 th:text="${userFeedback.content}">
+                            </div>
+                        
+                        
+
+                    </div>
+                                                                            <div class="form-group">
+                        <label class="col-sm-3 control-label">反馈时间：</label>
+
+                                                    <div style="padding-top:8px" class="col-sm-8"
+                                 th:text="${userFeedback.createTime}==null?null:${#dates.format(userFeedback.createTime,'yyyy-MM-dd HH:mm:ss')}">
+                            </div>
+                        
+
+                    </div>
+                                                    </form>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+<div th:include="include::footer"></div>
+</body>
+</html>

novel-admin/src/main/resources/templates/novel/userFeedback/edit.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content ">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-content">
+                    <form class="form-horizontal m-t" id="signupForm">
+                        <input id="id" name="id" th:value="${userFeedback.id}"
+                               type="hidden">
+                                                                                                                                        <div class="form-group">
+                                                                            <label class="col-sm-3 control-label">用户id：</label>
+                                                                        <div class="col-sm-8">
+                                                                                    <input id="userId" name="userId"
+                                                   th:value="${userFeedback.userId}"
+                                                   class="form-control"
+                                                   type="text">
+                                                                            </div>
+                                </div>
+                                                                                                                <div class="form-group">
+                                                                            <label class="col-sm-3 control-label">反馈内容：</label>
+                                                                        <div class="col-sm-8">
+                                                                                    <input id="content" name="content"
+                                                   th:value="${userFeedback.content}"
+                                                   class="form-control"
+                                                   type="text">
+                                                                            </div>
+                                </div>
+                                                                                                                <div class="form-group">
+                                                                            <label class="col-sm-3 control-label">反馈时间：</label>
+                                                                        <div class="col-sm-8">
+                                                                                    <input type="text" class="laydate-icon layer-date form-control"
+                                                   id="createTime"
+                                                   name="createTime"
+                                                   th:value="${userFeedback.createTime}==null?null:${#dates.format(userFeedback.createTime,'yyyy-MM-dd HH:mm:ss')}"
+                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
+                                                   style="background-color: #fff;" readonly="readonly"/>
+                                                                            </div>
+                                </div>
+                                                                            <div class="form-group">
+                            <div class="col-sm-8 col-sm-offset-3">
+                                <button type="submit" class="btn btn-primary">提交</button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript" src="/wangEditor/release/wangEditor.js"></script>
+<script type="text/javascript" src="/js/appjs/novel/userFeedback/edit.js">
+</script>
+</body>
+</html>

novel-admin/src/main/resources/templates/novel/userFeedback/userFeedback.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content ">
+    <div class="col-sm-12">
+        <div class="ibox">
+            <div class="ibox-body">
+                <div class="fixed-table-toolbar">
+
+                </div>
+                <table id="exampleTable" data-mobile-responsive="true">
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<!--shiro控制bootstraptable行内按钮看见性 -->
+<div>
+    <script type="text/javascript">
+        var s_detail_h = 'hidden';
+        var s_edit_h = 'hidden';
+        var s_remove_h = 'hidden';
+    </script>
+</div>
+<div shiro:hasPermission="test:order:detail">
+    <script type="text/javascript">
+        s_detail_h = '';
+    </script>
+</div>
+<div shiro:hasPermission="novel:userFeedback:edit">
+    <script type="text/javascript">
+        s_edit_h = '';
+    </script>
+</div>
+<div shiro:hasPermission="novel:userFeedback:remove">
+    <script type="text/javascript">
+        var s_remove_h = '';
+    </script>
+</div>
+<div th:include="include :: footer"></div>
+<script type="text/javascript" src="/js/appjs/novel/userFeedback/userFeedback.js"></script>
+</body>
+</html>

novel-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>4.0.0</version>
+        <version>4.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.2</version>
+            <version>4.5.14</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>

novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
  * @author 11797
  */
 @Slf4j
-@ControllerAdvice(basePackages = "com.java2nb.novel.page")
+@ControllerAdvice(basePackages = "com.java2nb.novel.controller.page")
 public class PageExceptionHandler {
 
 

novel-common/src/main/java/com/java2nb/novel/core/utils/RandomValidateCodeUtil.java

@@ -1,13 +1,13 @@
 package com.java2nb.novel.core.utils;
 
-import com.java2nb.novel.core.cache.CacheService;
+import lombok.SneakyThrows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.io.OutputStream;
 import java.util.Random;
 
 /**
@@ -18,27 +18,27 @@ public class RandomValidateCodeUtil {
 
     /**
      * 放到session中的key
-     * */
+     */
     public static final String RANDOM_CODE_KEY = "randomValidateCodeKey";
     /**
      * 随机产生只有数字的字符串 private String
-     * */
+     */
     private String randString = "0123456789";
     /**
      * 图片宽
-     * */
+     */
     private int width = 100;
     /**
      * 图片高
-     * */
+     */
     private int height = 38;
     /**
      * 干扰线数量
-     * */
+     */
     private int lineSize = 40;
     /**
      * 随机产生字符数量
-     * */
+     */
     private int stringNum = 4;
 
     private static final Logger logger = LoggerFactory.getLogger(RandomValidateCodeUtil.class);
@@ -69,9 +69,10 @@ public class RandomValidateCodeUtil {
     }
 
     /**
-     * 生成随机图片
+     * 生成随机码图片
      */
-    public void getRandcode(CacheService cacheService, HttpServletResponse response) {
+    @SneakyThrows
+    public String genRandCodeImage(OutputStream out) {
         // BufferedImage类是具有缓冲区的Image类,Image类是用于描述图像信息的类
         BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_BGR);
         // 产生Image对象的Graphics对象,改对象可以在图像上进行各种绘制操作
@@ -80,7 +81,7 @@ public class RandomValidateCodeUtil {
         g.fillRect(0, 0, width, height);
         //字体大小
         //字体颜色
-        g.setColor(new Color(204,204,204));
+        g.setColor(new Color(204, 204, 204));
         // 绘制干扰线
         for (int i = 0; i <= lineSize; i++) {
             drowLine(g);
@@ -90,17 +91,10 @@ public class RandomValidateCodeUtil {
         for (int i = 1; i <= stringNum; i++) {
             randomString = drowString(g, randomString, i);
         }
-        logger.info(randomString);
-        //将生成的随机字符串保存到缓存中
-        cacheService.set(RANDOM_CODE_KEY,randomString,60*5);
         g.dispose();
-        try {
-            // 将内存中的图片通过流动形式输出到客户端
-            ImageIO.write(image, "JPEG", response.getOutputStream());
-        } catch (Exception e) {
-            logger.error("将内存中的图片通过流动形式输出到客户端失败>>>> ", e);
-        }
-
+        // 将内存中的图片通过流动形式输出到客户端
+        ImageIO.write(image, "JPEG", out);
+        return randomString;
     }
 
     /**
@@ -109,9 +103,9 @@ public class RandomValidateCodeUtil {
     private String drowString(Graphics g, String randomString, int i) {
         g.setFont(getFont());
         g.setColor(new Color(random.nextInt(101), random.nextInt(111), random
-                .nextInt(121)));
+            .nextInt(121)));
         String rand = String.valueOf(getRandomString(random.nextInt(randString
-                .length())));
+            .length())));
         randomString += rand;
         g.translate(random.nextInt(3), random.nextInt(3));
         g.drawString(rand, 13 * i, 23);

novel-common/src/main/resources/application-common-dev.yml

@@ -69,8 +69,8 @@ sharding:
 
 content:
   save:
-    storage: db #存储介质，db：数据库，file：txt文本
-    path: /Users/xiongxiaoyang/books  #txt小说文本保存路径
+    storage: db # 小说内容存储方式：db-数据库，txt-TXT文本
+    path: /Users/xiongxiaoyang/books  # 小说TXT文本保存路径
 
 # HTTP 代理配置
 http:

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>4.0.0</version>
+        <version>4.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,6 +26,12 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
 
     </dependencies>
 

novel-crawl/src/main/build/config/application-common-prod.yml

@@ -39,8 +39,8 @@ crawl:
 #小说内容保存配置
 content:
   save:
-    storage: db #存储介质，db：数据库，file：txt文本
-    path: /Users/xiongxiaoyang/books  #txt小说文本保存路径
+    storage: db # 小说内容存储方式：db-数据库，txt-TXT文本
+    path: /Users/xiongxiaoyang/books  # 小说TXT文本保存路径
 
 # HTTP 代理配置
 http:

novel-crawl/src/main/java/com/java2nb/novel/controller/page/PageController.java

@@ -1,4 +1,4 @@
-package com.java2nb.novel.controller;
+package com.java2nb.novel.controller.page;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public class PageController {
 
 
-
     @RequestMapping("{url}.html")
     public String module(@PathVariable("url") String url) {
         return url;
@@ -27,13 +26,14 @@ public class PageController {
     }
 
     @RequestMapping("{module}/{classify}/{url}.html")
-    public String module3(@PathVariable("module") String module, @PathVariable("classify") String classify, @PathVariable("url") String url) {
+    public String module3(@PathVariable("module") String module, @PathVariable("classify") String classify,
+        @PathVariable("url") String url) {
         return module + "/" + classify + "/" + url;
     }
 
     /**
      * 首页
-     * */
+     */
     @RequestMapping(path = {"/", "/index", "/index.html"})
     public String index() {
         return "crawl/crawlSource_list";

novel-crawl/src/main/java/com/java2nb/novel/core/config/SecurityConfiguration.java

@@ -1,4 +1,5 @@
 package com.java2nb.novel.core.config;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -14,6 +15,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 
 /**
  * SpringSecurity配置
+ *
  * @author Administrator
  */
 @Configuration
@@ -48,17 +50,14 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable()//禁用了 csrf 功能
-                .authorizeRequests()//限定签名成功的请求
-                .antMatchers("/**").hasRole("ADMIN")
-                .anyRequest().permitAll()//其他没有限定的请求，允许访问
-                .and().anonymous()//对于没有配置权限的其他请求允许匿名访问
-                .and().formLogin()//使用 spring security 默认登录页面
-                .and().httpBasic();//启用http 基础验证
+        http.csrf().disable()
+            .authorizeRequests()
+            .antMatchers("/css/**").permitAll()
+            .antMatchers("/**").hasRole("ADMIN")
+            .and().formLogin().loginPage("/login.html").loginProcessingUrl("/login").permitAll()
+            .and().httpBasic();
 
     }
 
 
-
-
 }

novel-crawl/src/main/resources/static/css/signin.css

@@ -0,0 +1,44 @@
+body {
+    padding-top: 40px;
+    padding-bottom: 40px;
+    background-color: #eee;
+}
+
+.form-signin {
+    max-width: 330px;
+    padding: 15px;
+    margin: 0 auto;
+}
+
+.form-signin .form-signin-heading,
+.form-signin .checkbox {
+    margin-bottom: 10px;
+}
+
+.form-signin .checkbox {
+    font-weight: 400;
+}
+
+.form-signin .form-control {
+    position: relative;
+    box-sizing: border-box;
+    height: auto;
+    padding: 10px;
+    font-size: 16px;
+}
+
+.form-signin .form-control:focus {
+    z-index: 2;
+}
+
+.form-signin input[type="email"] {
+    margin-bottom: -1px;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.form-signin input[type="password"] {
+    margin-bottom: 10px;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+}

novel-crawl/src/main/resources/templates/login.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <title>Please sign in</title>
+    <link href="/css/bootstrap.min.css" rel="stylesheet"
+          integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
+    <link href="/css/signin.css" rel="stylesheet" crossorigin="anonymous"/>
+</head>
+<body>
+<div class="container">
+    <form class="form-signin" method="post" action="/login">
+        <h2 class="form-signin-heading">Please sign in</h2>
+        <p>
+            <label for="username" class="sr-only">Username</label>
+            <input type="text" id="username" name="username" class="form-control" placeholder="Username" required
+                   autofocus>
+        </p>
+        <p>
+            <label for="password" class="sr-only">Password</label>
+            <input type="password" id="password" name="password" class="form-control" placeholder="Password" required>
+        </p>
+        <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
+    </form>
+</div>
+</body>
+</html>

novel-front/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>4.0.0</version>
+        <version>4.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,24 +39,17 @@
             <version>${commons-fileupload.version}</version>
         </dependency>
 
-        <!--FastDfs-->
-        <dependency>
-            <groupId>com.github.tobato</groupId>
-            <artifactId>fastdfs-client</artifactId>
-            <version>${fastdfs-client.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-        </dependency>
-
-
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>
             <version>${alipay-sdk-java.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

novel-front/src/main/build/config/application-common-prod.yml

@@ -39,8 +39,8 @@ templates:
 #小说内容保存配置
 content:
   save:
-    storage: db #存储介质，db：数据库，file：txt文本
-    path: /Users/xiongxiaoyang/books  #txt小说文本保存路径
+    storage: db # 小说内容存储方式：db-数据库，txt-TXT文本
+    path: /Users/xiongxiaoyang/books  # 小说TXT文本保存路径
 
 
 

novel-front/src/main/java/com/java2nb/novel/FrontNovelApplication.java

@@ -1,6 +1,5 @@
 package com.java2nb.novel;
 
-import com.github.tobato.fastdfs.FdfsClientConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.CommandLineRunner;
@@ -10,7 +9,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@@ -27,7 +25,6 @@ import java.net.InetAddress;
 @EnableCaching
 @ServletComponentScan
 @MapperScan(basePackages = {"com.java2nb.novel.mapper"})
-@Import(FdfsClientConfig.class)
 @Slf4j
 public class FrontNovelApplication {
 
@@ -38,7 +35,9 @@ public class FrontNovelApplication {
     @Bean
     public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
         return args -> {
-            log.info("项目启动啦，访问路径：{}", "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + ctx.getEnvironment().getProperty("server.port"));
+            log.info("项目启动啦，访问路径：{}",
+                "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + ctx.getEnvironment()
+                    .getProperty("server.port"));
         };
     }
 

novel-front/src/main/java/com/java2nb/novel/controller/FileController.java

@@ -5,6 +5,7 @@ import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.utils.Constants;
 import com.java2nb.novel.core.utils.FileUtil;
+import com.java2nb.novel.core.utils.IpUtil;
 import com.java2nb.novel.core.utils.RandomValidateCodeUtil;
 import io.github.xxyopen.model.resp.RestResult;
 import io.github.xxyopen.util.UUIDUtil;
@@ -41,24 +42,25 @@ public class FileController {
      * 生成验证码
      */
     @GetMapping(value = "getVerify")
+    @SneakyThrows
     public void getVerify(HttpServletRequest request, HttpServletResponse response) {
-        try {
-            //设置相应类型,告诉浏览器输出的内容为图片
-            response.setContentType("image/jpeg");
-            //设置响应头信息，告诉浏览器不要缓存此内容
-            response.setHeader("Pragma", "No-cache");
-            response.setHeader("Cache-Control", "no-cache");
-            response.setDateHeader("Expire", 0);
-            RandomValidateCodeUtil randomValidateCode = new RandomValidateCodeUtil();
-            //输出验证码图片方法
-            randomValidateCode.getRandcode(cacheService, response);
-        } catch (Exception e) {
-            log.error("获取验证码失败>>>> ", e);
-        }
+        //设置相应类型,告诉浏览器输出的内容为图片
+        response.setContentType("image/jpeg");
+        //设置响应头信息，告诉浏览器不要缓存此内容
+        response.setHeader("Pragma", "No-cache");
+        response.setHeader("Cache-Control", "no-cache");
+        response.setDateHeader("Expire", 0);
+        RandomValidateCodeUtil randomValidateCode = new RandomValidateCodeUtil();
+        //输出验证码图片方法
+        String randomString = randomValidateCode.genRandCodeImage(response.getOutputStream());
+        //将生成的随机字符串保存到缓存中
+        cacheService.set(RandomValidateCodeUtil.RANDOM_CODE_KEY + ":" + IpUtil.getRealIp(request), randomString,
+            60 * 5);
     }
 
     /**
      * 图片上传
+     *
      * @return
      */
     @SneakyThrows
@@ -67,25 +69,26 @@ public class FileController {
     RestResult<String> upload(@RequestParam("file") MultipartFile file) {
         Date currentDate = new Date();
         String savePath =
-                Constants.LOCAL_PIC_PREFIX + DateUtils.formatDate(currentDate, "yyyy") + "/" +
-                        DateUtils.formatDate(currentDate, "MM") + "/" +
-                        DateUtils.formatDate(currentDate, "dd");
+            Constants.LOCAL_PIC_PREFIX + DateUtils.formatDate(currentDate, "yyyy") + "/" +
+                DateUtils.formatDate(currentDate, "MM") + "/" +
+                DateUtils.formatDate(currentDate, "dd");
         String oriName = file.getOriginalFilename();
         assert oriName != null;
         String saveFileName = UUIDUtil.getUUID32() + oriName.substring(oriName.lastIndexOf("."));
         File saveFile = new File(picSavePath + savePath, saveFileName);
         if (!saveFile.getParentFile().exists()) {
             boolean isSuccess = saveFile.getParentFile().mkdirs();
-            if(!isSuccess){
+            if (!isSuccess) {
                 throw new BusinessException(ResponseStatus.FILE_DIR_MAKE_FAIL);
             }
         }
         file.transferTo(saveFile);
-        if(!FileUtil.isImage(saveFile)){
+        if (!FileUtil.isImage(saveFile)) {
             //上传的文件不是图片
             saveFile.delete();
             throw new BusinessException(ResponseStatus.FILE_NOT_IMAGE);
-        };
+        }
+        ;
         return RestResult.ok(savePath + "/" + saveFileName);
 
     }

novel-front/src/main/java/com/java2nb/novel/controller/PayController.java

@@ -1,11 +1,15 @@
 package com.java2nb.novel.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.internal.util.AlipaySignature;
 import com.alipay.api.request.AlipayTradePagePayRequest;
+import com.alipay.api.request.AlipayTradeWapPayRequest;
+import com.alipay.api.response.AlipayTradeWapPayResponse;
 import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.config.AlipayProperties;
+import com.java2nb.novel.core.utils.ThreadLocalUtil;
 import com.java2nb.novel.service.OrderService;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -41,32 +45,60 @@ public class PayController extends BaseController {
      */
     @SneakyThrows
     @PostMapping("aliPay")
-    public void aliPay(Integer payAmount,HttpServletRequest request,HttpServletResponse httpResponse) {
+    public void aliPay(Integer payAmount, HttpServletRequest request, HttpServletResponse httpResponse) {
 
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             //未登录，跳转到登陆页面
-            httpResponse.sendRedirect("/user/login.html?originUrl=/pay/aliPay?payAmount="+payAmount);
-        }else {
+            httpResponse.sendRedirect("/user/login.html?originUrl=/pay/aliPay?payAmount=" + payAmount);
+        } else {
             //创建充值订单
-            Long outTradeNo = orderService.createPayOrder((byte)1,payAmount,userDetails.getId());
-
+            Long outTradeNo = orderService.createPayOrder((byte) 1, payAmount, userDetails.getId());
             //获得初始化的AlipayClient
-            AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig.getGatewayUrl(), alipayConfig.getAppId(), alipayConfig.getMerchantPrivateKey(), "json", alipayConfig.getCharset(), alipayConfig.getPublicKey(), alipayConfig.getSignType());
-            //创建API对应的request
-            AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest();
-            alipayRequest.setReturnUrl(alipayConfig.getReturnUrl());
-            //在公共参数中设置回跳和通知地址
-            alipayRequest.setNotifyUrl(alipayConfig.getNotifyUrl());
-            //填充业务参数
-            alipayRequest.setBizContent("{" +
+            AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig.getGatewayUrl(),
+                alipayConfig.getAppId(), alipayConfig.getMerchantPrivateKey(), "json", alipayConfig.getCharset(),
+                alipayConfig.getPublicKey(), alipayConfig.getSignType());
+            String form;
+            if (ThreadLocalUtil.getTemplateDir().contains("mobile")) {
+                // 手机站
+                AlipayTradeWapPayRequest alipayRequest = new AlipayTradeWapPayRequest();
+                alipayRequest.setReturnUrl(alipayConfig.getReturnUrl());
+                //在公共参数中设置回跳和通知地址
+                alipayRequest.setNotifyUrl(alipayConfig.getNotifyUrl());
+                /******必传参数******/
+                JSONObject bizContent = new JSONObject();
+                //商户订单号，商家自定义，保持唯一性
+                bizContent.put("out_trade_no", outTradeNo);
+                //支付金额，最小值0.01元
+                bizContent.put("total_amount", payAmount);
+                //订单标题，不可使用特殊符号
+                bizContent.put("subject", "小说精品屋-plus");
+
+                /******可选参数******/
+                //手机网站支付默认传值FAST_INSTANT_TRADE_PAY
+                bizContent.put("product_code", "QUICK_WAP_WAY");
+
+                alipayRequest.setBizContent(bizContent.toString());
+                AlipayTradeWapPayResponse response = alipayClient.pageExecute(alipayRequest);
+                form = alipayClient.pageExecute(alipayRequest).getBody();
+            } else {
+                // 电脑站
+                //创建API对应的request
+                AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest();
+                alipayRequest.setReturnUrl(alipayConfig.getReturnUrl());
+                //在公共参数中设置回跳和通知地址
+                alipayRequest.setNotifyUrl(alipayConfig.getNotifyUrl());
+                //填充业务参数
+                alipayRequest.setBizContent("{" +
                     "    \"out_trade_no\":\"" + outTradeNo + "\"," +
                     "    \"product_code\":\"FAST_INSTANT_TRADE_PAY\"," +
                     "    \"total_amount\":" + payAmount + "," +
                     "    \"subject\":\"小说精品屋-plus\"" +
                     "  }");
-            //调用SDK生成表单
-            String form = alipayClient.pageExecute(alipayRequest).getBody();
+                //调用SDK生成表单
+                form = alipayClient.pageExecute(alipayRequest).getBody();
+
+            }
 
             httpResponse.setContentType("text/html;charset=utf-8");
             //直接将完整的表单html输出到页面
@@ -76,35 +108,33 @@ public class PayController extends BaseController {
         }
 
 
-
-
     }
 
     /**
      * 支付宝支付通知
-     * */
+     */
     @SneakyThrows
     @RequestMapping("aliPay/notify")
-    public void aliPayNotify(HttpServletRequest request,HttpServletResponse httpResponse){
-
+    public void aliPayNotify(HttpServletRequest request, HttpServletResponse httpResponse) {
 
         PrintWriter out = httpResponse.getWriter();
 
         //获取支付宝POST过来反馈信息
-        Map<String,String> params = new HashMap<>();
-        Map<String,String[]> requestParams = request.getParameterMap();
+        Map<String, String> params = new HashMap<>();
+        Map<String, String[]> requestParams = request.getParameterMap();
         for (String name : requestParams.keySet()) {
             String[] values = requestParams.get(name);
             String valueStr = "";
             for (int i = 0; i < values.length; i++) {
                 valueStr = (i == values.length - 1) ? valueStr + values[i]
-                        : valueStr + values[i] + ",";
+                    : valueStr + values[i] + ",";
             }
             params.put(name, valueStr);
         }
 
         //调用SDK验证签名
-        boolean signVerified = AlipaySignature.rsaCheckV1(params, alipayConfig.getPublicKey(), alipayConfig.getCharset(), alipayConfig.getSignType());
+        boolean signVerified = AlipaySignature.rsaCheckV1(params, alipayConfig.getPublicKey(),
+            alipayConfig.getCharset(), alipayConfig.getSignType());
 
         //——请在这里编写您的程序（以下代码仅作参考）——
 
@@ -114,24 +144,26 @@ public class PayController extends BaseController {
 	3、校验通知中的seller_id（或者seller_email) 是否为out_trade_no这笔单据的对应的操作方（有的时候，一个商户可能有多个seller_id/seller_email）
 	4、验证app_id是否为该商户本身。
 	*/
-        if(signVerified) {
+        if (signVerified) {
             //验证成功
             //商户订单号
-            String outTradeNo = new String(request.getParameter("out_trade_no").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+            String outTradeNo = new String(request.getParameter("out_trade_no").getBytes(StandardCharsets.ISO_8859_1),
+                StandardCharsets.UTF_8);
 
             //支付宝交易号
-            String tradeNo = new String(request.getParameter("trade_no").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+            String tradeNo = new String(request.getParameter("trade_no").getBytes(StandardCharsets.ISO_8859_1),
+                StandardCharsets.UTF_8);
 
             //交易状态
-            String tradeStatus = new String(request.getParameter("trade_status").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+            String tradeStatus = new String(request.getParameter("trade_status").getBytes(StandardCharsets.ISO_8859_1),
+                StandardCharsets.UTF_8);
 
             //更新订单状态
             orderService.updatePayOrder(Long.parseLong(outTradeNo), tradeNo, tradeStatus);
 
-
             out.println("success");
 
-        }else {//验证失败
+        } else {//验证失败
             out.println("fail");
 
             //调试用，写文本函数记录程序运行情况是否正常
@@ -140,12 +172,7 @@ public class PayController extends BaseController {
         }
 
 
-
     }
 
 
-
-
-
-
-}
+}

novel-front/src/main/java/com/java2nb/novel/controller/UserController.java

@@ -4,6 +4,7 @@ package com.java2nb.novel.controller;
 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.IpUtil;
 import com.java2nb.novel.core.utils.RandomValidateCodeUtil;
 import com.java2nb.novel.entity.User;
 import com.java2nb.novel.entity.UserBuyRecord;
@@ -59,11 +60,12 @@ public class UserController extends BaseController {
      * 注册
      */
     @PostMapping("register")
-    public RestResult<?> register(@Validated({AddGroup.class}) User user, @RequestParam(value = "velCode", defaultValue = "") String velCode) {
-
+    public RestResult<?> register(@Validated({AddGroup.class}) User user,
+        @RequestParam(value = "velCode", defaultValue = "") String velCode, HttpServletRequest request) {
 
         //判断验证码是否正确
-        if (!velCode.equals(cacheService.get(RandomValidateCodeUtil.RANDOM_CODE_KEY))) {
+        if (!velCode.equals(
+            cacheService.get(RandomValidateCodeUtil.RANDOM_CODE_KEY + ":" + IpUtil.getRealIp(request)))) {
             return RestResult.fail(ResponseStatus.VEL_CODE_ERROR);
         }
 
@@ -113,95 +115,98 @@ public class UserController extends BaseController {
 
     /**
      * 加入书架
-     * */
+     */
     @PostMapping("addToBookShelf")
-    public RestResult<Void> addToBookShelf(Long bookId,Long preContentId, HttpServletRequest request) {
+    public RestResult<Void> addToBookShelf(Long bookId, Long preContentId, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        userService.addToBookShelf(userDetails.getId(),bookId,preContentId);
+        userService.addToBookShelf(userDetails.getId(), bookId, preContentId);
         return RestResult.ok();
     }
 
     /**
      * 移出书架
-     * */
+     */
     @DeleteMapping("removeFromBookShelf/{bookId}")
     public RestResult<?> removeFromBookShelf(@PathVariable("bookId") Long bookId, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        userService.removeFromBookShelf(userDetails.getId(),bookId);
+        userService.removeFromBookShelf(userDetails.getId(), bookId);
         return RestResult.ok();
     }
 
     /**
      * 分页查询书架
-     * */
+     */
     @GetMapping("listBookShelfByPage")
-    public RestResult<?> listBookShelfByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
+    public RestResult<?> listBookShelfByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
+        @RequestParam(value = "limit", defaultValue = "10") int pageSize, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        return RestResult.ok(userService.listBookShelfByPage(userDetails.getId(),page,pageSize));
+        return RestResult.ok(userService.listBookShelfByPage(userDetails.getId(), page, pageSize));
     }
 
     /**
      * 分页查询阅读记录
-     * */
+     */
     @GetMapping("listReadHistoryByPage")
-    public RestResult<?> listReadHistoryByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
+    public RestResult<?> listReadHistoryByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
+        @RequestParam(value = "limit", defaultValue = "10") int pageSize, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        return RestResult.ok(userService.listReadHistoryByPage(userDetails.getId(),page,pageSize));
+        return RestResult.ok(userService.listReadHistoryByPage(userDetails.getId(), page, pageSize));
     }
 
     /**
      * 添加阅读记录
-     * */
+     */
     @PostMapping("addReadHistory")
-    public RestResult<?> addReadHistory(Long bookId,Long preContentId, HttpServletRequest request) {
+    public RestResult<?> addReadHistory(Long bookId, Long preContentId, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        userService.addReadHistory(userDetails.getId(),bookId,preContentId);
+        userService.addReadHistory(userDetails.getId(), bookId, preContentId);
         return RestResult.ok();
     }
 
     /**
      * 添加反馈
-     * */
+     */
     @PostMapping("addFeedBack")
     public RestResult<?> addFeedBack(String content, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        userService.addFeedBack(userDetails.getId(),content);
+        userService.addFeedBack(userDetails.getId(), content);
         return RestResult.ok();
     }
 
     /**
      * 分页查询我的反馈列表
-     * */
+     */
     @GetMapping("listUserFeedBackByPage")
-    public RestResult<?> listUserFeedBackByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request){
+    public RestResult<?> listUserFeedBackByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
+        @RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        return RestResult.ok(userService.listUserFeedBackByPage(userDetails.getId(),page,pageSize));
+        return RestResult.ok(userService.listUserFeedBackByPage(userDetails.getId(), page, pageSize));
     }
 
     /**
      * 查询个人信息
-     * */
+     */
     @GetMapping("userInfo")
     public RestResult<?> userInfo(HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
@@ -213,15 +218,15 @@ public class UserController extends BaseController {
 
     /**
      * 更新个人信息
-     * */
+     */
     @PostMapping("updateUserInfo")
     public RestResult<?> updateUserInfo(@Validated({UpdateGroup.class}) User user, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        userService.updateUserInfo(userDetails.getId(),user);
-        if(user.getNickName() != null){
+        userService.updateUserInfo(userDetails.getId(), user);
+        if (user.getNickName() != null) {
             userDetails.setNickName(user.getNickName());
             Map<String, Object> data = new HashMap<>(1);
             data.put("token", jwtTokenUtil.generateToken(userDetails));
@@ -233,36 +238,38 @@ public class UserController extends BaseController {
 
     /**
      * 更新密码
-     * */
+     */
     @PostMapping("updatePassword")
-    public RestResult<?> updatePassword(String oldPassword,String newPassword1,String newPassword2,HttpServletRequest request) {
+    public RestResult<?> updatePassword(String oldPassword, String newPassword1, String newPassword2,
+        HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        if(!(StringUtils.isNotBlank(newPassword1) && newPassword1.equals(newPassword2))){
+        if (!(StringUtils.isNotBlank(newPassword1) && newPassword1.equals(newPassword2))) {
             RestResult.fail(ResponseStatus.TWO_PASSWORD_DIFF);
         }
-        userService.updatePassword(userDetails.getId(),oldPassword,newPassword1);
+        userService.updatePassword(userDetails.getId(), oldPassword, newPassword1);
         return RestResult.ok();
     }
 
     /**
      * 分页查询用户书评
-     * */
+     */
     @GetMapping("listCommentByPage")
-    public RestResult<?> listCommentByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,HttpServletRequest request) {
+    public RestResult<?> listCommentByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
+        @RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
-        return RestResult.ok(bookService.listCommentByPage(userDetails.getId(),null,page,pageSize));
+        return RestResult.ok(bookService.listCommentByPage(userDetails.getId(), null, page, pageSize));
     }
 
 
     /**
      * 购买小说章节
-     * */
+     */
     @PostMapping("buyBookIndex")
     public RestResult<?> buyBookIndex(UserBuyRecord buyRecord, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
@@ -270,12 +277,9 @@ public class UserController extends BaseController {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
         buyRecord.setBuyAmount(bookService.queryBookIndex(buyRecord.getBookIndexId()).getBookPrice());
-        userService.buyBookIndex(userDetails.getId(),buyRecord);
+        userService.buyBookIndex(userDetails.getId(), buyRecord);
         return RestResult.ok();
     }
 
 
-
-
-
 }

novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java

@@ -1,5 +1,6 @@
-package com.java2nb.novel.controller;
+package com.java2nb.novel.controller.page;
 
+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.*;
@@ -91,6 +92,55 @@ public class PageController extends BaseController {
         return ThreadLocalUtil.getTemplateDir() + "index";
     }
 
+    /**
+     * 登录页
+     */
+    @RequestMapping("user/login.html")
+    public String login() {
+        return ThreadLocalUtil.getTemplateDir() + "user/login";
+    }
+
+    /**
+     * 注册页
+     */
+    @RequestMapping("user/register.html")
+    public String register() {
+        return ThreadLocalUtil.getTemplateDir() + "user/register";
+    }
+
+    /**
+     * 用户中心页
+     */
+    @RequestMapping("user/userinfo.html")
+    public String userinfo() {
+        return ThreadLocalUtil.getTemplateDir() + "user/userinfo";
+    }
+
+    /**
+     * 我的书架页
+     */
+    @RequestMapping("user/favorites.html")
+    public String favorites() {
+        return ThreadLocalUtil.getTemplateDir() + "user/favorites";
+    }
+
+    /**
+     * 阅读历史页
+     */
+    @RequestMapping("user/read_history.html")
+    public String readHistory() {
+        return ThreadLocalUtil.getTemplateDir() + "user/read_history";
+    }
+
+    /**
+     * 充值页
+     */
+    @RequestMapping("pay/index.html")
+    public String pay() {
+        return ThreadLocalUtil.getTemplateDir() + "pay/index.html";
+    }
+
+
     /**
      * 作品页
      */

novel-front/src/main/java/com/java2nb/novel/core/config/WebMvcConfig.java

@@ -0,0 +1,17 @@
+package com.java2nb.novel.core.config;
+
+import com.java2nb.novel.core.converter.DateConverter;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * @author xiongxiaoyang
+ */
+@Configuration
+public class WebMvcConfig extends WebMvcConfigurerAdapter {
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new DateConverter());
+    }
+}

novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java

@@ -50,6 +50,7 @@ import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.bookContent;
 import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.content;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.*;
 import static com.java2nb.novel.mapper.BookIndexDynamicSqlSupport.bookIndex;
+import static com.java2nb.novel.mapper.BookSettingDynamicSqlSupport.bookSetting;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 import static org.mybatis.dynamic.sql.select.SelectDSL.select;
 
@@ -147,6 +148,8 @@ public class BookServiceImpl implements BookService {
                 bookSettingVOList.add(bookSettingVO);
             }
 
+            bookSettingMapper.delete(deleteFrom(bookSetting).build()
+                .render(RenderingStrategies.MYBATIS3));
             bookSettingMapper.insertMultiple(bookSettingList);
 
             return bookSettingVOList;

novel-front/src/main/java/com/java2nb/novel/service/impl/FastDfsFileServiceImpl.java

@@ -1,60 +0,0 @@
-package com.java2nb.novel.service.impl;
-
-import com.github.tobato.fastdfs.domain.StorePath;
-import com.github.tobato.fastdfs.service.FastFileStorageClient;
-import com.java2nb.novel.core.utils.Constants;
-import com.java2nb.novel.core.utils.FileUtil;
-import com.java2nb.novel.service.FileService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.io.FileInputStream;
-
-/**
- * @author 11797
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-@ConditionalOnProperty(prefix = "pic.save", name = "storage", havingValue = "fastDfs")
-public class FastDfsFileServiceImpl implements FileService {
-
-    private final FastFileStorageClient storageClient;
-
-    @Value("${fdfs.webUrl}")
-    private String webUrl;
-
-    @Override
-    public String transFile(String picSrc, String picSavePath) {
-
-        File file;
-        String filePath = FileUtil.network2Local(picSrc, picSavePath, Constants.LOCAL_PIC_PREFIX);
-        if (filePath.contains(Constants.LOCAL_PIC_PREFIX)) {
-            file = new File(picSavePath + filePath);
-        } else {
-            //默认图片不存储
-            return filePath;
-        }
-
-        try {
-            FileInputStream inputStream = new FileInputStream(file);
-            StorePath storePath = storageClient.uploadFile(inputStream, file.length(),
-                    FilenameUtils.getExtension(file.getName()), null);
-            //这里额外加上LOCAL_PIC_PREFIX路径，表明该图片是个人资源，而不是爬虫爬取的网络资源，不需要再次进行转换，
-            // 实际访问时，再通过nginx的rewite指令来重写路径，去掉LOCAL_PIC_PREFIX
-            return webUrl+Constants.LOCAL_PIC_PREFIX+storePath.getFullPath();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        } finally {
-            //删除
-            file.delete();
-        }
-
-        return "/images/default.gif";
-    }
-}

novel-front/src/main/java/com/java2nb/novel/vo/BookReadHistoryVO.java

@@ -19,9 +19,19 @@ public class BookReadHistoryVO extends UserReadHistory {
     private String lastIndexName;
     private String bookName;
 
-    @JsonFormat(timezone = "GMT+8", pattern = "MM/dd HH:mm:ss")
+    private String picUrl;
+
+    private Long authorId;
+
+    private String authorName;
+
+    private String bookDesc;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "MM/dd HH:mm")
     private Date lastIndexUpdateTime;
 
+    private Byte bookStatus;
+
 
     @Override
     public String toString() {

novel-front/src/main/java/com/java2nb/novel/vo/BookShelfVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.java2nb.novel.entity.UserBookshelf;
 import lombok.Data;
 
+import javax.annotation.Generated;
 import java.util.Date;
 
 /**
@@ -19,9 +20,19 @@ public class BookShelfVO extends UserBookshelf {
     private String lastIndexName;
     private String bookName;
 
-    @JsonFormat(timezone = "GMT+8", pattern = "MM/dd HH:mm:ss")
+
+    private String picUrl;
+
+    private Long authorId;
+
+    private String authorName;
+
+    private String bookDesc;
+
     private Date lastIndexUpdateTime;
 
+    private Byte bookStatus;
+
 
     @Override
     public String toString() {

novel-front/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
 pic:
   save:
     type: 1 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
-    storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
+    storage: local #存储介质，local：本地，OSS：阿里云对象存储
     path: /Users/xiongxiaoyang/java/  #图片保存路径
 
 

novel-front/src/main/resources/application-fastdfs.yml

@@ -1,16 +0,0 @@
-#FastDfs的配置	====================================
-#读取inputsream阻塞时间
-fdfs:
-  connect-timeout: 600
-  so-timeout: 1500
-  #tracker地址
-  trackerList: 127.0.0.1:22122
-  #缩略图配置
-  thumbImage:
-    height: 150
-    width: 150
-  #通过nginx 访问地址
-  webUrl: http://127.0.0.1/
-  #获取连接池最大数量
-  pool.max-total: 200
-

novel-front/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    include: [common-prod]
+    include: [ common-prod ]
 
   #静态文件路径配置
   resources:
@@ -18,7 +18,7 @@ templates:
 pic:
   save:
     type: 2 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
-    storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
+    storage: local #存储介质，local：本地，OSS：阿里云对象存储
     path: /var/pic  #图片保存路径
 
 

novel-front/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 spring:
   profiles:
     active: dev
-    include: website,alipay,oss,fastdfs
+    include: website,alipay,oss
 
 jwt:
   secret: novel!#20191230

novel-front/src/main/resources/mybatis/mapping/UserBookshelfMapper.xml

@@ -4,7 +4,8 @@
 <mapper namespace="com.java2nb.novel.mapper.FrontUserBookshelfMapper">
 
     <select id="listBookShelf" parameterType="long" resultType="com.java2nb.novel.vo.BookShelfVO">
-        select t1.book_id,t1.pre_content_id,t2.book_name,t2.cat_id,t2.cat_name,t2.last_index_id,t2.last_index_name,t2.last_index_update_time
+        select t1.book_id,t1.pre_content_id,t2.book_name,t2.cat_id,t2.cat_name,t2.last_index_id,t2.last_index_name,t2.last_index_update_time,
+               t2.pic_url,t2.author_id,t2.author_name,t2.book_desc,t2.book_status
         from user_bookshelf t1 inner join book t2 on t1.book_id = t2.id and t1.user_id = #{userId}
         order by t1.create_time desc
 

novel-front/src/main/resources/mybatis/mapping/UserReadHistoryMapper.xml

@@ -4,12 +4,25 @@
 <mapper namespace="com.java2nb.novel.mapper.FrontUserReadHistoryMapper">
 
     <select id="listReadHistory" parameterType="long" resultType="com.java2nb.novel.vo.BookReadHistoryVO">
-        select t1.book_id,t1.pre_content_id,t2.book_name,t2.cat_id,t2.cat_name,t2.last_index_id,t2.last_index_name,t2.last_index_update_time
-        from user_read_history t1 inner join book t2 on t1.book_id = t2.id and t1.user_id = #{userId}
+
+        select t1.book_id,
+               t1.pre_content_id,
+               t2.book_name,
+               t2.cat_id,
+               t2.cat_name,
+               t2.last_index_id,
+               t2.last_index_name,
+               t2.last_index_update_time,
+               t2.pic_url,
+               t2.author_id,
+               t2.author_name,
+               t2.book_desc,
+               t2.book_status
+        from user_read_history t1
+                 inner join book t2 on t1.book_id = t2.id and t1.user_id = #{userId}
         order by t1.create_time desc
 
     </select>
 
 
-
 </mapper>

novel-front/src/main/resources/static/mobile/js/common.js

@@ -1,3 +1,94 @@
+var needLoginPath = ['/user/favorites.html', '/user/comment.html', '/user/feedback.html',
+    '/user/feedback_list.html', '/user/read_history.html', '/user/set_name.html',
+    '/user/set_password.html', '/user/set_sex.html', '/user/setup.html', '/user/userinfo.html',
+    "/pay/index.html," +
+    "/author/register.html", "/author/index.html"];
+var isLogin = false;
+var url = window.location.search;
+
+//key(需要检索的键）
+function getSearchString(key) {
+    var str = url;
+    str = str.substring(1, str.length); // 获取URL中?之后的字符（去掉第一位的问号）
+    // 以&分隔字符串，获得类似name=xiaoli这样的元素数组
+    var arr = str.split("&");
+
+    for (var i = 0; i < arr.length; i++) {
+        var tmp_arr = arr[i].split("=");
+        if (tmp_arr[0] == key) {
+            return decodeURIComponent(tmp_arr[1]);
+        }
+    }
+    return undefined;
+}
+
+var keyword = getSearchString("k");
+if (keyword != undefined) {
+    $("#searchKey").val(keyword);
+    $("#workDirection").remove();
+    $("#idGirl").remove();
+}
+
+function searchByK(k) {
+    if (!k) {
+        window.location.href = '/book/bookclass.html?k=' + encodeURIComponent(document.getElementById("searchKey").value)
+    } else {
+        window.location.href = '/book/bookclass.html?k=' + encodeURIComponent(k)
+    }
+}
+
+$("#searchKey").keypress(function (even) {
+    if (even.which == 13) {
+        even.stopPropagation();
+        //enter键按下
+        searchByK();
+    }
+});
+Array.prototype.indexOf = function (val) {
+    for (var i = 0; i < this.length; i++) {
+        if (this[i] == val) return i;
+    }
+    return -1;
+};
+
+jQuery.cookie = function (name, value, options) {
+    if (typeof value != 'undefined') {
+        options = options || {};
+        if (value === null) {
+            value = '';
+            options.expires = -1;
+        }
+        var expires = '';
+        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+            var date;
+            if (typeof options.expires == 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString();
+        }
+        var path = options.path ? '; path=' + options.path : '';
+        var domain = options.domain ? '; domain=' + options.domain : '';
+        var secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    } else {
+        var cookieValue = null;
+        if (document.cookie && document.cookie != '') {
+            var cookies = document.cookie.split(';');
+            for (var i = 0; i < cookies.length; i++) {
+                var cookie = jQuery.trim(cookies[i]);
+                if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                    break;
+                }
+            }
+        }
+        return cookieValue;
+    }
+};
+
 Array.prototype.indexOf = function (val) {
     for (var i = 0; i < this.length; i++) {
         if (this[i] == val) return i;
@@ -12,13 +103,53 @@ Array.prototype.remove = function (val) {
     }
 };
 
-var token = localStorage.getItem("token");
-if (token) {
-    $.get("/user/isLogin", {"token": token}, function (data) {
-        if (data.code != 1) {//未登录
-            localStorage.removeItem("token");
+var token = $.cookie('Authorization');
+if (!token) {
+    if (needLoginPath.indexOf(window.location.pathname) != -1) {
+        location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+    }
+
+    $(".user_link").html("<a href=\"/user/login.html\">登录</a>｜<a href=\"/user/register.html\">注册</a>");
+} else {
+    $.ajax({
+        type: "POST",
+        url: "/user/refreshToken",
+        data: {},
+        dataType: "json",
+        success: function (data) {
+            if (data.code == 200) {
+                $(".user_link").html("<a href=\"/user/userinfo.html\"><i style=\"font-size: 20px;\" class=\"layui-icon \n" +
+                    "\">&#xe66f;" +
+                    "\n" +
+                    "</i></a>");
+                if ("/user/login.html" == window.location.pathname) {
+                    var orginUrl = getSearchString("originUrl");
+                    window.location.href = orginUrl == undefined || orginUrl.isBlank() ? "/" : orginUrl;
+                    return;
+                }
+                isLogin = true;
+                if (localStorage.getItem("autoLogin") == 1) {
+                    $.cookie('Authorization', data.data.token, {expires: 7, path: '/'});
+                } else {
+                    $.cookie('Authorization', data.data.token, {path: '/'});
+                }
+            } else {
+                if (needLoginPath.indexOf(window.location.pathname) != -1) {
+                    location.href = '/user/login.html';
+                }
+                $(".user_link").html("<a href=\"/user/login.html\">登录</a>｜<a href=\"/user/register.html\">注册</a>");
+            }
+        },
+        error: function () {
+            layer.alert('网络异常');
         }
-    })
+
+    });
+}
+
+function logout() {
+    $.cookie('Authorization', null, {path: '/'});
+    location.reload();
 }
 
 
@@ -45,5 +176,26 @@ function getQueryVariable(variable) {
     return (false);
 }
 
+String.prototype.isPhone = function () {
+    var strTemp = /^1[3|4|5|6|7|8|9][0-9]{9}$/;
+    if (strTemp.test(this)) {
+        return true;
+    }
+    return false;
+};
+
+String.prototype.isBlank = function () {
+    if (this == null || $.trim(this) == "") {
+        return true;
+    }
+    return false;
+};
+String.prototype.isNickName = function () {
+    var strTemp = /^[\u4E00-\u9FA5A-Za-z0-9_]+$/;
+    if (strTemp.test(this)) {
+        return true;
+    }
+    return false;
+};
 
 

novel-front/src/main/resources/static/mobile/layui/css/layui.css

@@ -1847,7 +1847,7 @@ a cite {
 }
 
 .layui-btn-primary:hover {
-    border-color: #009688;
+    border-color: #f80;
     color: #333
 }
 
@@ -2230,11 +2230,11 @@ a cite {
 }
 
 .layui-form-checked span, .layui-form-checked:hover span {
-    background-color: #5FB878
+    background-color: #f80
 }
 
 .layui-form-checked i, .layui-form-checked:hover i {
-    color: #5FB878
+    color: #f80
 }
 
 .layui-form-item .layui-form-checkbox {
@@ -2276,13 +2276,13 @@ a cite {
 }
 
 .layui-form-checkbox[lay-skin=primary]:hover i {
-    border-color: #5FB878;
+    border-color: #f80;
     color: #fff
 }
 
 .layui-form-checked[lay-skin=primary] i {
-    border-color: #5FB878;
-    background-color: #5FB878;
+    border-color: #f80;
+    background-color: #f80;
     color: #fff
 }
 

novel-front/src/main/resources/templates/author/index.html

@@ -1,5 +1,5 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!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>
     <head>
@@ -7,16 +7,17 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
         <title>作家管理系统-小说精品屋</title>
         <link rel="stylesheet" href="/css/base.css?v=1"/>
-        <link rel="stylesheet" href="/css/user.css" />
+        <link rel="stylesheet" href="/css/user.css"/>
         <style type="text/css">
-            .redBtn{
+            .redBtn {
                 padding: 5px;
                 border-radius: 20px;
                 border: 1px solid #f80;
                 background: #f80;
                 color: #fff;
             }
-            a.redBtn:hover{
+
+            a.redBtn:hover {
 
                 color: #fff;
             }
@@ -27,7 +28,8 @@
 
 <div class="header">
     <div class="mainNav" id="mainNav">
-        <div class="box_center cf" style="text-align: center;height: 44px;line-height: 48px;color: #fff;font-size: 16px;">
+        <div class="box_center cf"
+             style="text-align: center;height: 44px;line-height: 48px;color: #fff;font-size: 16px;">
 
             小说精品屋作家管理
 
@@ -48,7 +50,7 @@
 
         </div>
         <div class="my_r">
-            <div id="noContentDiv"  >
+            <div id="noContentDiv">
                 <div class="tc" style="margin-top: 200px"><a href="/author/book_add.html" class="btn_red">创建作品</a></div>
 
             </div>
@@ -88,7 +90,6 @@
                         <tbody id="bookList">
 
 
-
                         </tbody>
                     </table>
                     <div class="pageBox cf" id="shellPage">
@@ -148,52 +149,52 @@
         $.ajax({
             type: "get",
             url: "/author/listBookByPage",
-            data: {'curr':curr,'limit':limit},
+            data: {'curr': curr, 'limit': limit},
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {
                     var bookList = data.data.list;
                     if (bookList.length > 0) {
-                        $("#hasContentDiv").css("display","block");
-                        $("#noContentDiv").css("display","none");
+                        $("#hasContentDiv").css("display", "block");
+                        $("#noContentDiv").css("display", "none");
                         var bookListHtml = "";
-                        for(var i=0;i<bookList.length;i++){
+                        for (var i = 0; i < bookList.length; i++) {
                             var book = bookList[i];
-                            bookListHtml+=(" <tr class=\"book_list\" vals=\"291\">\n" +
+                            bookListHtml += (" <tr class=\"book_list\" vals=\"291\">\n" +
                                 /* "                            <td class=\"style bookclass\">\n" +
                                  "                                ["+(i+1)+"]\n" +
                                  "                            </td>\n" +*/
 
                                 "                            <td style=\"position: relative\" class=\"goread\">\n" +
-                                "<input class=\"opacity\" onchange=\"picChange('"+book.id+"')\"\n" +
-                                "                                           type=\"file\" id=\"file0\" name=\"file\"\n" +
+                                "<input class=\"opacity\" onchange=\"picChange('" + book.id + "'," + i + ")\"\n" +
+                                "                                           type=\"file\" id=\"file" + i + "\" name=\"file\"\n" +
                                 "                                           title=\"点击上传图片\"\n" +
                                 "                                           style=\"z-index: 100;cursor: pointer;left: 30px; top: 0px; width: 60px; height: 80px; opacity: 0; position: absolute;  \"\n" +
                                 "                                    />" +
-                                "<img width='50' height='70' src='"+book.picUrl+"'/><br/>" +
-                                "                                "+book.bookName+"</td>\n" +
+                                "<img width='50' height='70' src='" + book.picUrl + "'/><br/>" +
+                                "                                " + book.bookName + "</td>\n" +
 
 
                                 "                            <td class=\"goread\" >"
-                                +book.catName+"</td>\n" +
+                                + book.catName + "</td>\n" +
 
                                 "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
-                                +book.visitCount+"</td>\n" +
+                                + book.visitCount + "</td>\n" +
 
                                 "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
-                                +book.yesterdayBuy+"</td>\n" +
+                                + book.yesterdayBuy + "</td>\n" +
 
                                 "                            <td class=\"goread\">\n" +
-                                "                                "+new Date(Date.parse(book.lastIndexUpdateTime?book.lastIndexUpdateTime:book.updateTime)).Format("yyyy-MM-dd hh:mm")+"更新\n" +
+                                "                                " + new Date(Date.parse(book.lastIndexUpdateTime ? book.lastIndexUpdateTime : book.updateTime)).Format("yyyy-MM-dd hh:mm") + "更新\n" +
                                 "                            </td>\n" +
 
                                 "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
-                                +book.wordCount+"</td>\n" +
+                                + book.wordCount + "</td>\n" +
 
-                                " <td class=\"goread\" id='opt"+book.id+"'>" +
-                                "<a target='_blank' class='redBtn' href='/author/index_list.html?bookId="+book.id+"'>章节管理  </a><br/>" +
-                                "<a target='_blank' href='/author/author_income_detail.html?bookId="+book.id+"'>薪酬查询  </a><br/>"+
-                                "<a target='_blank' href='/book/"+book.id+".html'>作品信息</a>"+
+                                " <td class=\"goread\" id='opt" + book.id + "'>" +
+                                "<a target='_blank' class='redBtn' href='/author/index_list.html?bookId=" + book.id + "'>章节管理  </a><br/>" +
+                                "<a target='_blank' href='/author/author_income_detail.html?bookId=" + book.id + "'>薪酬查询  </a><br/>" +
+                                "<a target='_blank' href='/book/" + book.id + ".html'>作品信息</a>" +
                                 "</td>                     </tr>");
                         }
                         $("#bookList").html(bookListHtml);
@@ -232,7 +233,7 @@
                     //未登录
                     location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
 
-                }else {
+                } else {
                     layer.alert(data.msg);
                 }
 
@@ -245,12 +246,12 @@
     }
 
 
-    function updateBookStatus(bookId,status) {
+    function updateBookStatus(bookId, status) {
 
         $.ajax({
             type: "POST",
             url: "/author/updateBookStatus",
-            data: {'bookId':bookId,'status':status==0?1:0},
+            data: {'bookId': bookId, 'status': status == 0 ? 1 : 0},
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {
@@ -262,7 +263,7 @@
                     //未登录
                     location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
 
-                }else {
+                } else {
                     layer.alert(data.msg);
                 }
 
@@ -273,21 +274,18 @@
         })
 
 
-
-
-
     }
 
 
-    function picChange(bookId) {
-        var file = $("#file0").val(); //文件名称
+    function picChange(bookId, i) {
+        var file = $("#file" + i).val(); //文件名称
         if (file != "") {
-            if(checkPicUpload($("#file0")[0])) {
+            if (checkPicUpload($("#file" + i)[0])) {
 
                 $.ajaxFileUpload({
                     url: "/file/picUpload", //用于文件上传的服务器端请求地址
                     secureuri: false, //是否需要安全协议，一般设置为false
-                    fileElementId: "file0", //文件上传域的ID
+                    fileElementId: "file" + i, //文件上传域的ID
                     dataType: "json", //返回值类型 一般设置为json
                     type: "post",
                     success: function (data) { //服务器成功响应处理函数
@@ -327,7 +325,6 @@
         }
 
 
-
     }
 </script>
 </html>

novel-front/src/main/resources/templates/mobile/book/book_detail.html

@@ -5,30 +5,29 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title th:utext="${book.bookName}+'小说最新章节免费阅读和下载'"></title>
 
-    <meta name="keywords" th:content="${book.bookName}+','+${book.bookName}+'最新章节,'+${book.bookName}+'免费阅读,'+${book.bookName}+'TXT下载'">
+    <meta name="keywords"
+          th:content="${book.bookName}+','+${book.bookName}+'最新章节,'+${book.bookName}+'免费阅读,'+${book.bookName}+'TXT下载'">
 
     <meta name="description"
           th:content="${book.bookName}+'最新章节列表,'+${book.bookName}+'最新更新章节免费无广告无弹窗在线阅读,'+${book.bookName}+'小说TXT免费下载。'">
 
 
-
-
     <div th:include="mobile/common/css :: css"></div>
 
     <style type="text/css">
 
-        .indexP p a{
-            color:#4c6978;
+        .indexP p a {
+            color: #4c6978;
         }
 
         .tag-list {
             padding-top: 0px;
             padding-bottom: 20px;
             position: fixed;
-            top:50px;
+            top: 50px;
             right: 0px;
             width: 120px;
-            z-index:100000;
+            z-index: 100000;
         }
 
         .tag-list .tag {
@@ -43,6 +42,7 @@
             margin-right: 8px;
             font-size: 12px;
         }
+
         .tag-list .highlight {
             padding: 5px 9px;
             border: 1px solid #f90;
@@ -53,6 +53,7 @@
         .tag-list .highlight .text {
             color: #f90;
         }
+
         .tag-list .tag .text {
             display: inline-block;
             vertical-align: middle;
@@ -74,6 +75,7 @@
         .tag-list .highlight .icn {
             color: #f90;
         }
+
         .tag-list .tag .icn {
             margin-right: 5px;
             color: #ccc;
@@ -83,6 +85,7 @@
             padding-left: 3px;
             color: #f90;
         }
+
         .tag-list .tag .text {
             display: inline-block;
             vertical-align: middle;
@@ -106,89 +109,98 @@
 <body>
 <div id="content">
 
-<ul class="tag-list clearfix" id="tagLi">
+    <ul class="tag-list clearfix" id="tagLi">
 
-</ul>
+    </ul>
 
 
-<input type="hidden" id="bookIdHidden" th:value="${bookId}"/>
-<input type="hidden" id="bookNamedHidden" th:value="${book.bookName}"/>
+    <input type="hidden" id="bookIdHidden" th:value="${bookId}"/>
+    <input type="hidden" id="bookNamedHidden" th:value="${book.bookName}"/>
     <input type="hidden" id="preContentId" th:value="${firstBookIndexId}"/>
 
-<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+    <div style="height: 50px;line-height: 50px;text-align: center"
+         class="layui-header header header-doc  layui-bg-cyan">
 
-    <div style="float: left;margin-left: 10px">
-        <a href="javascript:history.go(-1)">
-            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+        <div style="float: left;margin-left: 10px">
+            <a href="javascript:history.go(-1)">
+                <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+        </div>
+        <b class="layui-icon" th:utext="${book.bookName}"></b>
+        <div style="float: right;margin-right: 10px">
+            <a href="/"><i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i></a>
+        </div>
     </div>
-    <b class="layui-icon" th:utext="${book.bookName}"></b>
-    <div style="float: right;margin-right: 10px">
-        <a href="/"><i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i></a>
-    </div>
-</div>
 
-<div class="layui-row" style="background: #f2f2f2">
-    <div style="padding: 3px" class="layui-col-xs4 layui-col-sm2 layui-col-md2 layui-col-lg2">
-        <img style=" width:130px; height:auto; max-width:100%; max-height:100%;" th:src="${book.picUrl}"/>
+    <div class="layui-row" style="background: #f2f2f2">
+        <div style="padding: 3px" class="layui-col-xs4 layui-col-sm2 layui-col-md2 layui-col-lg2">
+            <img style=" width:130px; height:auto; max-width:100%; max-height:100%;" th:src="${book.picUrl}"/>
 
-    </div>
-        <div style="position:relative;padding: 3px 10px 0px" class="layui-col-xs8 layui-col-sm8 layui-col-md8 layui-col-lg8">
-            <a th:href="'javascript:searchBooks(\''+ ${book.authorName}+'\')'"><div style=";color: #444;" th:utext="'作者：'+ ${book.authorName}"></div></a>
-            <a th:href="'/book/book_ranking.html?catId='+${book.catId}"><div style="margin-top: 5px;color: #444;" th:text="'类别：'+ ${book.catName}"></div></a>
+        </div>
+        <div style="position:relative;padding: 3px 10px 0px"
+             class="layui-col-xs8 layui-col-sm8 layui-col-md8 layui-col-lg8">
+            <a th:href="'javascript:searchBooks(\''+ ${book.authorName}+'\')'">
+                <div style=";color: #444;" th:utext="'作者：'+ ${book.authorName}"></div>
+            </a>
+            <a th:href="'/book/book_ranking.html?catId='+${book.catId}">
+                <div style="margin-top: 5px;color: #444;" th:text="'类别：'+ ${book.catName}"></div>
+            </a>
             <div style="margin-top: 5px;color: #444;" th:text="'状态：'+ ${book.bookStatus==0?'连载':'完结'}"></div>
-            <div style="margin-top: 5px;color: #444;">更新：<i  th:text="${#dates.format(book.lastIndexUpdateTime, 'yy-MM-dd')}"></i></div>
-            <div style="margin-top: 5px;color: #444;">评分：<i style="font-weight:bold;color: red" th:text="${book.score} + '分'"></i></div>
-            <div style="margin-top: 5px;color: #444;">点击：<i style="font-weight:bold;color: red" th:text="${book.visitCount}"></i></div>
+            <div style="margin-top: 5px;color: #444;">更新：<i
+                    th:text="${#dates.format(book.lastIndexUpdateTime, 'yy-MM-dd')}"></i></div>
+            <div style="margin-top: 5px;color: #444;">评分：<i style="font-weight:bold;color: red"
+                                                            th:text="${book.score} + '分'"></i></div>
+            <div style="margin-top: 5px;color: #444;">点击：<i style="font-weight:bold;color: red"
+                                                            th:text="${book.visitCount}"></i></div>
 
 
         </div>
     </div>
 
 
+    <div style="text-align: center;height: 45px;line-height: 45px">
+        <a th:href="'/book/'+${book.id}+'/'+${firstBookIndexId}+'.html'" type="button"
+           style="background-color:#ff8900!important" class="layui-btn layui-btn-sm layui-btn-radius">开始阅读</a>
+        <button type="button" id="cFavs" onclick="addInShell()"
+                style="border: 1px solid #f80;color: #f80;background-color:#fff!important"
+                class="layui-btn layui-btn-sm layui-btn-radius ">加入书架
+        </button>
 
-<div style="text-align: center;height: 45px;line-height: 45px">
-    <a th:href="'/book/'+${book.id}+'/'+${firstBookIndexId}+'.html'"  type="button" style="background-color:#ff8900!important" class="layui-btn layui-btn-sm layui-btn-radius">开始阅读</a>
-    <button type="button" id="cFavs" onclick="addInShell()" style="background-color:#ffA640!important" class="layui-btn layui-btn-sm layui-btn-radius ">加入书架</button>
+        <!--
+            <button type="button" onclick="downloadFile()" class="layui-btn layui-btn-sm layui-btn-radius layui-bg-normal">下载TXT</button>
+        -->
+    </div>
+    <p style="line-height: 23px;padding: 10px;font-size: 14px;color: #333;" th:utext="${book.bookDesc}">
 
-    <button type="button" onclick="location.href='/user/favorites.html'" style="background-color:#ffBE73!important" class="layui-btn layui-btn-sm layui-btn-radius ">我的书架</button>
-<!--
-    <button type="button" onclick="downloadFile()" class="layui-btn layui-btn-sm layui-btn-radius layui-bg-normal">下载TXT</button>
--->
-</div>
-<p style="line-height: 23px;padding: 10px;font-size: 14px;color: #333;" th:utext="${book.bookDesc}">
+    </p>
 
-</p>
-
-<div class="layui-collapse">
-    <div class="layui-colla-item" >
-        <h2 class="layui-colla-title">
-            <span>最新章节</span>
-            <span style="margin-left: 30px">
+    <div class="layui-collapse">
+        <div class="layui-colla-item">
+            <h2 class="layui-colla-title">
+                <span>最新章节</span>
+                <span style="margin-left: 30px">
                 更新： <i th:text="${#dates.format(book.lastIndexUpdateTime, 'yy-MM-dd HH:mm:ss')}"></i>
             </span>
-        </h2>
-        <div class="layui-colla-content layui-show indexP layui-row" id="indexList">
-
+            </h2>
+            <div class="layui-colla-content layui-show indexP layui-row" id="indexList">
 
 
+            </div>
         </div>
     </div>
-</div>
-<div style="height: 42px;color:#4c6978;line-height: 42px;padding-left: 30px;background: #f2f2f2" >
+    <div style="height: 42px;color:#4c6978;line-height: 42px;padding-left: 30px;background: #f2f2f2">
 
-    <a th:href="'/book/indexList-'+${book.id}+'.html'">查看完整目录</a>
-</div>
+        <a th:href="'/book/indexList-'+${book.id}+'.html'">查看完整目录</a>
+    </div>
 
-<!--
-<div style="position: fixed;top:0px;left:0px;z-index:-100;opacity: 0" th:utext="${attacDivForSearch}"></div>
--->
+    <!--
+    <div style="position: fixed;top:0px;left:0px;z-index:-100;opacity: 0" th:utext="${attacDivForSearch}"></div>
+    -->
 </div>
 
 <div th:replace="mobile/common/footer :: footer">
 </div>
 
 
-
 </body>
 <div th:replace="mobile/common/js :: js">
 </div>
@@ -202,7 +214,7 @@
         success: function (data) {
             if (data.code == 200) {
                 if (data.data) {
-                    $("#cFavs").html("<button type=\"button\" id=\"cFavs\"  class=\"layui-btn layui-btn-sm layui-btn-radius layui-btn-warm\">已在书架</button>");
+                    $("#cFavs").replaceWith("<button type=\"button\" id=\"cFavs\" style=\"border: 1px solid #f80;color: #f80;background-color:#fff!important\"  class=\"layui-btn layui-btn-sm layui-btn-radius layui-btn-warm\">已在书架</button>");
                 }
 
 
@@ -228,15 +240,14 @@
         success: function (data) {
             if (data.code == 200) {
                 var indexListHtml = "";
-                for(var i = 0 ; i < data.data.length ; i++){
+                for (var i = 0; i < data.data.length; i++) {
                     var bookIndex = data.data[i];
-                    indexListHtml+=("<p class=\"line-limit-length layui-col-xs12 layui-col-sm4 layui-col-md3 layui-col-lg2\" style=\"padding-left:10px;height: 50px;line-height: 50px;\"><a href=\"/book/"+$("#bookIdHidden").val()+"/"+bookIndex.id+".html\" style='color: #333'>"+bookIndex.indexName+"</a></p>");
+                    indexListHtml += ("<p class=\"line-limit-length layui-col-xs12 layui-col-sm4 layui-col-md3 layui-col-lg2\" style=\"padding-left:10px;height: 50px;line-height: 50px;\"><a href=\"/book/" + $("#bookIdHidden").val() + "/" + bookIndex.id + ".html\" style='color: #333'>" + bookIndex.indexName + "</a></p>");
                 }
 
                 $("#indexList").html(indexListHtml);
 
 
-
             } else if (data.code == 1001) {
                 //未登录
 
@@ -258,7 +269,7 @@
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {
-                        $("#cFavs").html("<button type=\"button\" id=\"cFavs\"  class=\"layui-btn layui-btn-sm layui-btn-radius layui-btn-warm\">已在书架</button>");
+                    $("#cFavs").replaceWith("<button type=\"button\" id=\"cFavs\" style=\"border: 1px solid #f80;color: #f80;background-color:#fff!important\"  class=\"layui-btn layui-btn-sm layui-btn-radius layui-btn-warm\">已在书架</button>");
 
 
                 } else if (data.code == 1001) {
@@ -278,59 +289,54 @@
     }
 
 
-
-
-    $("#content").css("min-height",($(window).height()-60)+"px");
+    $("#content").css("min-height", ($(window).height() - 60) + "px");
 
     function downloadFile() {
-        var fileUrl = '/book/download?bookId='+$("#bookIdHidden").val()+'&bookName='+$("#bookNamedHidden").val();
-        window.location.href=fileUrl;
+        var fileUrl = '/book/download?bookId=' + $("#bookIdHidden").val() + '&bookName=' + $("#bookNamedHidden").val();
+        window.location.href = fileUrl;
 
 
     }
 
 
-
-
-    function toMyCollect(){
+    function toMyCollect() {
         var token = localStorage.getItem("token");
-        if(token) {
+        if (token) {
             window.location.href = "/book/search?token=" + token;
-        }else{
+        } else {
             window.location.href = "/user/login.html";
         }
     }
 
-    function addToCollect(){
+    function addToCollect() {
         var token = localStorage.getItem("token");
 
-        if(token) {
-            $.get("/user/addToCollect",{"bookId":$("#bookIdHidden").val(),"token":token},function(data){
-                    layer.alert(data.desc);
-                    if(data.code == 1) {
-                        $('#collectButton').unbind("click");
-                        $("#collectButton").text("撤下书架");
-                        $("#collectButton").click(function () {
-                            cancelToCollect();
-                        });
-                    }
+        if (token) {
+            $.get("/user/addToCollect", {"bookId": $("#bookIdHidden").val(), "token": token}, function (data) {
+                layer.alert(data.desc);
+                if (data.code == 1) {
+                    $('#collectButton').unbind("click");
+                    $("#collectButton").text("撤下书架");
+                    $("#collectButton").click(function () {
+                        cancelToCollect();
+                    });
+                }
             });
-        }else{
-            window.location.href = "/user/login.html?bookId="+$("#bookIdHidden").val();
+        } else {
+            window.location.href = "/user/login.html?bookId=" + $("#bookIdHidden").val();
         }
 
 
-
     }
 
 
-    function cancelToCollect(){
+    function cancelToCollect() {
         var token = localStorage.getItem("token");
 
-        if(token) {
-            $.get("/user/cancelToCollect",{"bookId":$("#bookIdHidden").val(),"token":token},function(data){
-                    layer.alert(data.desc);
-                if(data.code == 1) {
+        if (token) {
+            $.get("/user/cancelToCollect", {"bookId": $("#bookIdHidden").val(), "token": token}, function (data) {
+                layer.alert(data.desc);
+                if (data.code == 1) {
                     $('#collectButton').unbind("click");
                     $("#collectButton").text("加入书架");
                     $("#collectButton").click(function () {
@@ -339,8 +345,8 @@
                 }
 
             });
-        }else{
-            window.location.href = "/user/login.html?bookId="+$("#bookIdHidden").val();
+        } else {
+            window.location.href = "/user/login.html?bookId=" + $("#bookIdHidden").val();
         }
 
     }

novel-front/src/main/resources/templates/mobile/common/js.html

@@ -1,3 +1,3 @@
 <script th:fragment="js" src="/mobile/js/jquery-1.9.1.js"></script>
-<script th:fragment="js" src="/mobile/js/common.js"></script>
 <script th:fragment="js" src="/mobile/layui/layui.all.js"></script>
+<script th:fragment="js" src="/mobile/js/common.js"></script>

novel-front/src/main/resources/templates/mobile/index.html

@@ -40,6 +40,21 @@
             -webkit-transition: all .3s;
         }
 
+        .user_link {
+            position: relative;
+            display: inline-block;
+            vertical-align: middle;
+            line-height: 50px;
+            padding: 0 5px;
+            color: #fff;
+            float: right;
+        }
+
+        .user_link a {
+
+            color: #fff;
+        }
+
     </style>
 
 
@@ -85,7 +100,7 @@
             <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=7">女频小说</a></dd>
         </dl>
     </li>
-    <li class="layui-nav-item"><a href="/user/favorites.html">书架</a></li>
+    <li class="user_link"></li>
 
 </ul>
 <ul class="layui-nav pc" lay-filter="" style="padding:0 36px;text-align: center">
@@ -120,9 +135,12 @@
             <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=7">女频小说</a></dd>
         </dl>
     </li>
+    <li class="user_link"></li>
+
 
 </ul>
 
+
 <div class="layui-container">
     <div class="layui-row">
 
@@ -170,7 +188,8 @@
 
         <div class="layui-container">
             <div class="layui-row" id="hotRecBooks" th:if="${bookMap['3']}">
-                <div th:each="book,iterStat : ${bookMap['3']}" th:if="${iterStat.index<6}" style="margin-bottom: 5px" class="layui-col-xs12 layui-col-sm6 layui-col-md4 layui-col-lg4">
+                <div th:each="book,iterStat : ${bookMap['3']}" th:if="${iterStat.index<6}" style="margin-bottom: 5px"
+                     class="layui-col-xs12 layui-col-sm6 layui-col-md4 layui-col-lg4">
                     <a th:href="'/book/'+${book.bookId}+'.html'">
                         <div class="layui-col-xs5 layui-col-sm4 layui-col-md4 layui-col-lg4">
                             <img style=" width:100px; height:125px;" th:src="${book.picUrl}">
@@ -178,11 +197,15 @@
                         </div>
                         <div class="layui-col-xs5 layui-col-sm6 layui-col-md6 layui-col-lg6">
                             <ul>
-                                <li style="padding-bottom: 2px" class="line-limit-length" th:text="${book.bookName}"></li>
+                                <li style="padding-bottom: 2px" class="line-limit-length"
+                                    th:text="${book.bookName}"></li>
                                 <li style="padding-bottom: 2px;color: #a6a6a6" th:text="'作者：'+${book.authorName}"></li>
-                                <li style="color: #a6a6a6;width: 180px;height:60px;overflow: hidden" th:utext="${book.bookDesc}">                                </li></ul>
+                                <li style="color: #a6a6a6;width: 180px;height:60px;overflow: hidden"
+                                    th:utext="${book.bookDesc}"></li>
+                            </ul>
                         </div>
-                        <div style="font-style: italic;color: red" class="layui-col-xs2 layui-col-sm2 layui-col-md2 layui-col-lg2"></div>
+                        <div style="font-style: italic;color: red"
+                             class="layui-col-xs2 layui-col-sm2 layui-col-md2 layui-col-lg2"></div>
                     </a>
                 </div>
 

novel-front/src/main/resources/templates/mobile/pay/index.html

@@ -0,0 +1,212 @@
+<!DOCTYPE html>
+<html lang="en">
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title th:text="${application.website.name}+'列表'"></title>
+
+    <meta name="keywords"
+          th:content="${application.website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">
+
+    <meta name="description"
+          th:content="${application.website.name}+'是国内优秀的小说弹幕网站,'+${application.website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">
+
+
+    <div th:include="mobile/common/css :: css"></div>
+
+    <style type="text/css">
+
+
+        .line-limit-length {
+
+            overflow: hidden;
+
+            text-overflow: ellipsis;
+
+            white-space: nowrap;
+
+        }
+
+        .indexP p a {
+            color: #4c6978;
+        }
+
+        .Readarea {
+            font-size: 18px;
+            line-height: 35px;
+            padding: 10px;
+            color: #333;
+        }
+
+        div, p {
+            wrap-work: break-word;
+            word-break: break-all;
+            word-wrap: break-word;
+            word-break: normal;
+            -moz-box-sizing: border-box;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            -ms-box-sizing: border-box;
+        }
+
+        .indexDiv a {
+            margin-left: 20px;
+        }
+
+        img {
+            width: 130px;
+            height: 180px;
+        }
+        .payHead {
+            height: 36px;
+            line-height: 36px;
+            padding: 20px 0 50px;
+            margin: 0 24px;
+            font-size: 16px;
+            border-bottom: 1px solid #eaeaea;
+            zoom: 1;
+        }
+        .pay_way li {
+            text-align: center;
+            cursor: pointer;
+            border: 2px solid #eee;
+            margin: 20px 0px 3px 43px;
+            padding-top: 20px;
+            padding-bottom: 20px;
+        }
+
+    </style>
+</head>
+<body>
+
+
+<input type="hidden" id="limit" th:value="${limit}"/>
+<input type="hidden" id="curr" th:value="${curr}"/>
+<input type="hidden" id="total" th:value="${total}"/>
+<input type="hidden" id="ids" th:value="${ids}"/>
+<input type="hidden" id="bookStatus" th:value="${bookStatus}"/>
+<input type="hidden" id="token" th:value="${token}"/>
+<input type="hidden" id="keyword" th:value="${keyword}"/>
+<input type="hidden" id="catId" th:value="${catId}"/>
+<input type="hidden" id="sortBy" th:value="${sortBy}"/>
+<input type="hidden" id="sort" th:value="${sort}"/>
+
+<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+
+    <div style="width:10%;float: left;margin-left: 10px">
+        <a href="javascript:history.go(-1)">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+    </div>
+    <b class="layui-icon">充值</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+    </a>
+    </div>
+</div>
+<div id="body" class="layui-row">
+    <div class="payHead cf">
+        <div class="fl">
+            充值账号：<span class="user_name" id="my_name">13560421324</span>&nbsp;&nbsp;&nbsp;&nbsp;余额：<em style="color: #f80" id="accountBalance">10</em> 屋币<!--<em class="red">+0</em>代金券-->
+        </div>
+    </div>
+    <div id="payAmount" class="pay_way layui-row layui-col-space15" style="text-align: center;padding-top: 20px;">
+        <h5>选择充值金额</h5>
+        <li vals="10" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>10元</strong><br><span class="pay_mn">1000屋币</span></div>
+            </div>
+        </li>
+        <li vals="30"  class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>30元</strong><br><span class="pay_mn">3000屋币</span></div>
+            </div>
+        </li>
+        <li vals="50" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>50元</strong><br><span class="pay_mn">5000屋币</span></div>
+            </div>
+        </li>
+        <li vals="100" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>100元</strong><br><span class="pay_mn">10000屋币</span></div>
+            </div>
+        </li>
+        <li vals="200" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>200元</strong><br><span class="pay_mn">20000屋币</span></div>
+            </div>
+        </li>
+        <li vals="500" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>500元</strong><br><span class="pay_mn">50000屋币</span></div>
+            </div>
+        </li>
+
+    </div>
+
+    <form action="/pay/aliPay" method="post" id="payform" name="payform">
+
+        <input type="hidden" id="pValue" name="payAmount"  />
+    </form>
+
+
+</div>
+<div th:replace="mobile/common/footer :: footer">
+</div>
+
+<a name="buttom"></a>
+</body>
+
+<div th:replace="mobile/common/js :: js"></div>
+
+<script>
+    $("#body").css("min-height",($(window).height() - 100)+"px")
+
+    //查询用户信息
+    $.ajax({
+        type: "get",
+        url: "/user/userInfo",
+        data: {},
+        dataType: "json",
+        success: function (data) {
+            if (data.code == 200) {
+                if(data.data.nickName){
+                    $("#my_name").html(data.data.nickName);
+                }else{
+                    $("#my_name").html(data.data.username);
+                }
+
+                $("#accountBalance").html(data.data.accountBalance);
+
+            } else if (data.code == 1001) {
+                //未登录
+                location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+            } else {
+                layer.alert(data.msg);
+            }
+
+        },
+        error: function () {
+            layer.alert('网络异常');
+        }
+    })
+
+    $("#payAmount").find("li").click(function () {
+
+        $("#pValue").val($(this).attr("vals"));
+
+        $("#payform").submit();
+
+
+
+    });
+
+
+</script>
+
+
+
+</html>

novel-front/src/main/resources/templates/mobile/user/favorites.html

@@ -0,0 +1,268 @@
+<!DOCTYPE html>
+<html lang="en">
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title th:text="${application.website.name}+'列表'"></title>
+
+    <meta name="keywords"
+          th:content="${application.website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">
+
+    <meta name="description"
+          th:content="${application.website.name}+'是国内优秀的小说弹幕网站,'+${application.website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">
+
+
+    <div th:include="mobile/common/css :: css"></div>
+
+    </div>
+
+    <style type="text/css">
+
+
+        .line-limit-length {
+
+            overflow: hidden;
+
+            text-overflow: ellipsis;
+
+            white-space: nowrap;
+
+        }
+
+        .indexP p a {
+            color: #4c6978;
+        }
+
+        .Readarea {
+            font-size: 18px;
+            line-height: 35px;
+            padding: 10px;
+            color: #333;
+        }
+
+        div, p {
+            wrap-work: break-word;
+            word-break: break-all;
+            word-wrap: break-word;
+            word-break: normal;
+            -moz-box-sizing: border-box;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            -ms-box-sizing: border-box;
+        }
+
+        .indexDiv a {
+            margin-left: 20px;
+        }
+
+        img {
+            width: 130px;
+            height: 180px;
+        }
+    </style>
+</head>
+<body>
+
+
+<input type="hidden" id="limit" th:value="${limit}"/>
+<input type="hidden" id="curr" th:value="${curr}"/>
+<input type="hidden" id="total" th:value="${total}"/>
+<input type="hidden" id="ids" th:value="${ids}"/>
+<input type="hidden" id="bookStatus" th:value="${bookStatus}"/>
+<input type="hidden" id="token" th:value="${token}"/>
+<input type="hidden" id="keyword" th:value="${keyword}"/>
+<input type="hidden" id="catId" th:value="${catId}"/>
+<input type="hidden" id="sortBy" th:value="${sortBy}"/>
+<input type="hidden" id="sort" th:value="${sort}"/>
+
+<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+
+    <div style="width:10%;float: left;margin-left: 10px">
+        <a href="javascript:history.go(-1)">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+    </div>
+    <b class="layui-icon">我的书架</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+    </a>
+    </div>
+</div>
+<div id="body">
+<div id="bookList">
+
+
+</div>
+
+
+<div id="books" style="text-align: center;"></div>
+
+</div>
+<div th:replace="mobile/common/footer :: footer">
+</div>
+
+<a name="buttom"></a>
+</body>
+
+<div th:replace="mobile/common/js :: js"></div>
+
+<script>
+    $("#body").css("min-height",($(window).height() - 110)+"px")
+
+    search(1,20);
+
+    function search(curr,limit) {
+
+
+        $.ajax({
+            type: "get",
+            url: "/user/listBookShelfByPage",
+            data: {'curr':curr,'limit':limit},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    var bookList = data.data.list;
+                    var bookListHtml = "";
+                    for (var i = 0; i < bookList.length; i++) {
+                        var book = bookList[i];
+
+                        /*var end = book.bookDesc.indexOf("<");
+                        if(end != -1) {
+                            book.bookDesc = book.bookDesc.substring(0,end);
+                        }*/
+
+                        if(book.bookDesc){
+                            book.bookDesc = book.bookDesc.replace(/<[^>]+>/g,"").replace(/\s+/g,"").replace(/&nbsp;/g,"");
+                        }
+
+                        bookListHtml += ("<div class=\"layui-row\" style=\"margin-bottom:10px;padding:10px;background: #f2f2f2\">\n" +
+                            "        <a href='/book/"+book.bookId+"/"+book.preContentId+".html'>\n" +
+                            "            <div class=\"layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2\" style=\"text-align: center\">\n" +
+                            "                <img style='width: 130px;height: 180px' align=\"center\"\n" +
+                            "                     src=\""+book.picUrl+"\"/>\n" +
+                            "\n" +
+                            "            </div>\n" +
+                            "        </a>\n" +
+                            "        <div style=\"padding: 10px\" class=\"layui-col-xs6 layui-col-sm8 layui-col-md8 layui-col-lg8\">\n" +
+                            "            <a href='/book/"+book.bookId+"/"+book.preContentId+".html'>\n" +
+                            "                <div class=\"line-limit-length\" style=\";color: #000;font-size: 15px\">"+book.bookName+"</div>\n" +
+                            "            </a>\n" +
+                            "            <div style=\";color: #4c6978;float: right;\"><i style=\"color: red\"></i></div>\n" +
+                            "            <a href='/book/"+book.bookId+"/"+book.preContentId+".html'>\n" +
+                            "                <div style=\";color: #a6a6a6;\" class=\"line-limit-length\">作者："+book.authorName+"</div>\n" +
+                            "            </a>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">类别："+book.catName+"</div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">状态："+(book.bookStatus==0?'连载':'完结')+"</div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">更新：<i style='color: red'>"+book.lastIndexUpdateTime.substr(0,11)+"</i>\n" +
+                            "            </div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">简介："+(book.bookDesc?(book.bookDesc.length>15?(book.bookDesc.substr(0,15)+"..."):book.bookDesc):book.bookDesc)+"</div>\n" +
+                            "\n" +
+                            "\n" +
+                            "        </div>\n" +
+                            "\n" +
+                            "    </div>");
+                    }
+                    $("#bookList").html(bookListHtml);
+
+                    layui.use('laypage', function () {
+                        var laypage = layui.laypage;
+
+                        //执行一个laypage实例
+                        laypage.render({
+                            elem: 'books' //注意，这里的 test1 是 ID，不用加 # 号
+                            , count: data.data.total //数据总数，从服务端得到,
+                            , curr: data.data.pageNum
+                            , limit: data.data.pageSize
+                            , jump: function (obj, first) {
+
+
+                                //obj包含了当前分页的所有参数，比如：
+                                console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
+                                console.log(obj.limit); //得到每页显示的条数
+
+
+                                //首次不执行
+                                if (!first) {
+                                    search(obj.curr, obj.limit);
+                                } else {
+
+                                }
+                            }
+                        });
+                    });
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
+
+    function searchByAllCondition(curr, limit, newKeyword) {
+        var toUrl = "/book/search?curr=" + curr + "&limit=" + limit;
+        var ids = $("#ids").val();
+        if (ids) {
+            toUrl += ("&historyBookIds=" + ids);
+        }
+        var token = $("#token").val();
+        if (token) {
+            toUrl += ("&token=" + token);
+        }
+        var keyword = $("#keyword").val();
+        if (newKeyword) {
+            toUrl += encodeURI("&keyword=" + newKeyword);
+        } else if (keyword) {
+            toUrl += encodeURI("&keyword=" + keyword);
+        }
+        var bookStatus = $("#bookStatus").val();
+        if (bookStatus) {
+            toUrl += ("&bookStatus=" + bookStatus);
+        }
+        var catId = $("#catId").val();
+        if (catId) {
+            toUrl += ("&catId=" + catId);
+        }
+
+        var sortBy = $("#sortBy").val();
+        if (sortBy) {
+            toUrl += ("&sortBy=" + sortBy);
+        }
+
+        var sort = $("#sort").val();
+        if (sort) {
+            toUrl += ("&sort=" + sort);
+        }
+
+        window.location.href = toUrl;
+    }
+
+    function searchBooks() {
+        var keywords = $("#title").val();
+        $("#keyword").val("");
+        searchByAllCondition(1, 20, keywords);
+    }
+
+</script>
+<script>
+
+
+
+
+    function toMyCollect() {
+        var token = localStorage.getItem("token");
+        if (token) {
+            window.location.href = "/book/search?token=" + token;
+        } else {
+            window.location.href = "/user/login.html";
+        }
+    }
+</script>
+
+
+</html>

novel-front/src/main/resources/templates/mobile/user/login.html

@@ -5,109 +5,114 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>登录|注册</title>
-
-    <div th:include="common/css :: css"></div>
+    <title>登录</title>
 
+    <div th:include="mobile/common/css :: css"></div>
 
 
 </head>
-<body id="read" >
-
-</div>
+<body id="read">
 
 <div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
 
-    <div style="float: left;margin-left: 10px">
+    <div style="width:10%;float: left;margin-left: 10px">
         <a href="javascript:history.go(-1)">
-            <i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe65c;</i></a>
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
     </div>
-    <b class="layui-icon">登录|注册</b>
-    <div style="float: right;margin-right: 10px"><a href="/">
-        <i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe68e;</i>
+    <b class="layui-icon">登录</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
     </a>
     </div>
 </div>
-
-<form style="height: 500px;margin-top: 50px" class="layui-form" action="">
+<form lay-filter="loginForm" id="form1" style="height: 500px;padding-top:30px;padding-right: 20px" class="layui-form" action="">
     <input type="hidden" id="bookIdHidden" name="bookId" th:value="${bookId}"/>
     <div class="layui-form-item">
-        <label class="layui-form-label">登录名</label>
-        <div class="layui-input-block">
-            <input type="text" id="loginName" name="loginName" required  lay-verify="required" placeholder="请输入登录名" autocomplete="off" class="layui-input">
+        <label class="layui-form-label">手机号码</label>
+        <div class="layui-input-inline">
+            <input name="txtUName" type="text" id="txtUName"  placeholder="请输入手机号"
+                   autocomplete="off" class="layui-input">
         </div>
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">密码</label>
         <div class="layui-input-inline">
-            <input id="password" type="password" name="password" required lay-verify="required" placeholder="请输入密码" autocomplete="off" class="layui-input">
+            <input name="txtPassword" type="password" id="txtPassword"  placeholder="请输入密码"
+                   autocomplete="off" class="layui-input">
         </div>
-        <div class="layui-form-mid layui-word-aux">如果登录名不存在，则直接注册！</div>
+
     </div>
     <div class="layui-form-item">
         <div class="layui-input-block">
-            <button class="layui-btn" lay-submit lay-filter="formDemo">登录|注册</button>
+            <input id="autoLogin" type="checkbox" lay-skin="primary" title="下次自动登录">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <input type="button" value="登录" id="btnLogin" class="layui-btn" />
             <button type="reset" class="layui-btn layui-btn-primary">重置</button>
         </div>
     </div>
 </form>
 
 
-<div th:replace="common/footer :: footer">
+<div th:replace="mobile/common/footer :: footer">
 </div>
-
-<a name="buttom"></a>
 </body>
-<div th:replace="common/js :: js"></div>
-
-<script>
-    $.get("/book/addVisit",{"bookId":$("#bookIdHidden").val()},function(){});
-
-</script>
-
-<script>
-    //Demo
-    layui.use('form', function(){
-        var form = layui.form;
-
-        //监听提交
-        form.on('submit(formDemo)', function(){
-            $.post("/user/loginOrRegist",{"bookId":$("#bookIdHidden").val(),"loginName":$("#loginName").val(),"password":$("#password").val()},function (data) {
-                if(data.code == 1 || data.code == 2){
-                    localStorage.setItem("token",data.token);
-                    layer.alert(data.desc);
-                    setTimeout(function () {
-                        var bookId = $("#bookIdHidden").val();
-                        if(bookId){
-                            //加入书架
-                            window.location.href="/book/"+bookId+".html";
-                        }else{
-                            //我的书架
-                            window.location.href="/book/search?token="+data.token;
-                        }
-                    },3000)
-
-                }else{
-                    layer.alert(data.desc);
-                }
-            });
-            return false;
-        });
-    });
-</script>
-<script>
-
-
-
-    function toMyCollect(){
-        var token = localStorage.getItem("token");
-        if(token) {
-            window.location.href = "/book/search?token=" + token;
-        }else{
-            window.location.href = "/user/login.html";
-        }
+<div th:replace="mobile/common/js :: js">
+</div>
+<script type="text/javascript">
+    $("#form1").css("min-height",($(window).height() - 140)+"px")
+    if(localStorage.getItem("autoLogin")==1){
+        $("#autoLogin").prop("checked",'true');
+        layui.form.render('checkbox','loginForm');
+    }else{
+        $("#autoLogin").removeAttr("checked");
     }
+    $("#btnLogin").click(function () {
+        var username = $("#txtUName").val();
+        if(username.isBlank()){
+            layer.alert("手机号不能为空！");
+            return;
+        }
+        if(!username.isPhone()){
+            layer.alert("手机号格式不正确！");
+            return;
+        }
+        var password = $("#txtPassword").val();
+        if(password.isBlank()){
+            layer.alert("密码不能为空！");
+            return;
+        }
+        $.ajax({
+            type: "POST",
+            url: "/user/login",
+            data: {"username": username, "password": password},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    if($("#autoLogin").is(':checked')){
+                        $.cookie('Authorization', data.data.token, { expires: 7 ,path: '/'  });
+                        localStorage.setItem("autoLogin","1");
+                    }else {
+                        $.cookie('Authorization', data.data.token,{ path: '/'  });
+                        localStorage.setItem("autoLogin","0");
+                    }
+                    var orginUrl = getSearchString("originUrl");
+                    window.location.href = orginUrl == undefined || orginUrl.isBlank() ? "/" : orginUrl;
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    })
 </script>
 
 
+
 </html>

novel-front/src/main/resources/templates/mobile/user/read_history.html

@@ -0,0 +1,266 @@
+<!DOCTYPE html>
+<html lang="en">
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title th:text="${application.website.name}+'列表'"></title>
+
+    <meta name="keywords"
+          th:content="${application.website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">
+
+    <meta name="description"
+          th:content="${application.website.name}+'是国内优秀的小说弹幕网站,'+${application.website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">
+
+
+    <div th:include="mobile/common/css :: css"></div>
+
+    </div>
+
+    <style type="text/css">
+
+
+        .line-limit-length {
+
+            overflow: hidden;
+
+            text-overflow: ellipsis;
+
+            white-space: nowrap;
+
+        }
+
+        .indexP p a {
+            color: #4c6978;
+        }
+
+        .Readarea {
+            font-size: 18px;
+            line-height: 35px;
+            padding: 10px;
+            color: #333;
+        }
+
+        div, p {
+            wrap-work: break-word;
+            word-break: break-all;
+            word-wrap: break-word;
+            word-break: normal;
+            -moz-box-sizing: border-box;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            -ms-box-sizing: border-box;
+        }
+
+        .indexDiv a {
+            margin-left: 20px;
+        }
+
+        img {
+            width: 130px;
+            height: 180px;
+        }
+    </style>
+</head>
+<body>
+
+
+<input type="hidden" id="limit" th:value="${limit}"/>
+<input type="hidden" id="curr" th:value="${curr}"/>
+<input type="hidden" id="total" th:value="${total}"/>
+<input type="hidden" id="ids" th:value="${ids}"/>
+<input type="hidden" id="bookStatus" th:value="${bookStatus}"/>
+<input type="hidden" id="token" th:value="${token}"/>
+<input type="hidden" id="keyword" th:value="${keyword}"/>
+<input type="hidden" id="catId" th:value="${catId}"/>
+<input type="hidden" id="sortBy" th:value="${sortBy}"/>
+<input type="hidden" id="sort" th:value="${sort}"/>
+
+<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+
+    <div style="width:10%;float: left;margin-left: 10px">
+        <a href="javascript:history.go(-1)">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+    </div>
+    <b class="layui-icon">阅读历史</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+    </a>
+    </div>
+</div>
+<div id="body">
+    <div id="bookList">
+
+
+    </div>
+
+
+    <div id="books" style="text-align: center;"></div>
+
+</div>
+<div th:replace="mobile/common/footer :: footer">
+</div>
+
+<a name="buttom"></a>
+</body>
+
+<div th:replace="mobile/common/js :: js"></div>
+
+<script>
+    $("#body").css("min-height", ($(window).height() - 110) + "px")
+
+    search(1, 20);
+
+    function search(curr, limit) {
+
+
+        $.ajax({
+            type: "get",
+            url: "/user/listReadHistoryByPage",
+            data: {'curr': curr, 'limit': limit},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    var bookList = data.data.list;
+                    var bookListHtml = "";
+                    for (var i = 0; i < bookList.length; i++) {
+                        var book = bookList[i];
+
+                        /*var end = book.bookDesc.indexOf("<");
+                        if(end != -1) {
+                            book.bookDesc = book.bookDesc.substring(0,end);
+                        }*/
+
+                        if (book.bookDesc) {
+                            book.bookDesc = book.bookDesc.replace(/<[^>]+>/g, "").replace(/\s+/g, "").replace(/&nbsp;/g, "");
+                        }
+
+                        bookListHtml += ("<div class=\"layui-row\" style=\"margin-bottom:10px;padding:10px;background: #f2f2f2\">\n" +
+                            "        <a href='/book/" + book.bookId + "/" + book.preContentId + ".html'>\n" +
+                            "            <div class=\"layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2\" style=\"text-align: center\">\n" +
+                            "                <img style='width: 130px;height: 180px' align=\"center\"\n" +
+                            "                     src=\"" + book.picUrl + "\"/>\n" +
+                            "\n" +
+                            "            </div>\n" +
+                            "        </a>\n" +
+                            "        <div style=\"padding: 10px\" class=\"layui-col-xs6 layui-col-sm8 layui-col-md8 layui-col-lg8\">\n" +
+                            "            <a href='/book/" + book.bookId + "/" + book.preContentId + ".html'>\n" +
+                            "                <div class=\"line-limit-length\" style=\";color: #000;font-size: 15px\">" + book.bookName + "</div>\n" +
+                            "            </a>\n" +
+                            "            <div style=\";color: #4c6978;float: right;\"><i style=\"color: red\"></i></div>\n" +
+                            "            <a href='/book/" + book.bookId + "/" + book.preContentId + ".html'>\n" +
+                            "                <div style=\";color: #a6a6a6;\" class=\"line-limit-length\">作者：" + book.authorName + "</div>\n" +
+                            "            </a>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">类别：" + book.catName + "</div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">状态：" + (book.bookStatus == 0 ? '连载' : '完结') + "</div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">更新：<i style='color: red'>" + book.lastIndexUpdateTime.substr(0, 11) + "</i>\n" +
+                            "            </div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">简介：" + (book.bookDesc ? (book.bookDesc.length > 15 ? (book.bookDesc.substr(0, 15) + "...") : book.bookDesc) : book.bookDesc) + "</div>\n" +
+                            "\n" +
+                            "\n" +
+                            "        </div>\n" +
+                            "\n" +
+                            "    </div>");
+                    }
+                    $("#bookList").html(bookListHtml);
+
+                    layui.use('laypage', function () {
+                        var laypage = layui.laypage;
+
+                        //执行一个laypage实例
+                        laypage.render({
+                            elem: 'books' //注意，这里的 test1 是 ID，不用加 # 号
+                            , count: data.data.total //数据总数，从服务端得到,
+                            , curr: data.data.pageNum
+                            , limit: data.data.pageSize
+                            , jump: function (obj, first) {
+
+
+                                //obj包含了当前分页的所有参数，比如：
+                                console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
+                                console.log(obj.limit); //得到每页显示的条数
+
+
+                                //首次不执行
+                                if (!first) {
+                                    search(obj.curr, obj.limit);
+                                } else {
+
+                                }
+                            }
+                        });
+                    });
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
+
+    function searchByAllCondition(curr, limit, newKeyword) {
+        var toUrl = "/book/search?curr=" + curr + "&limit=" + limit;
+        var ids = $("#ids").val();
+        if (ids) {
+            toUrl += ("&historyBookIds=" + ids);
+        }
+        var token = $("#token").val();
+        if (token) {
+            toUrl += ("&token=" + token);
+        }
+        var keyword = $("#keyword").val();
+        if (newKeyword) {
+            toUrl += encodeURI("&keyword=" + newKeyword);
+        } else if (keyword) {
+            toUrl += encodeURI("&keyword=" + keyword);
+        }
+        var bookStatus = $("#bookStatus").val();
+        if (bookStatus) {
+            toUrl += ("&bookStatus=" + bookStatus);
+        }
+        var catId = $("#catId").val();
+        if (catId) {
+            toUrl += ("&catId=" + catId);
+        }
+
+        var sortBy = $("#sortBy").val();
+        if (sortBy) {
+            toUrl += ("&sortBy=" + sortBy);
+        }
+
+        var sort = $("#sort").val();
+        if (sort) {
+            toUrl += ("&sort=" + sort);
+        }
+
+        window.location.href = toUrl;
+    }
+
+    function searchBooks() {
+        var keywords = $("#title").val();
+        $("#keyword").val("");
+        searchByAllCondition(1, 20, keywords);
+    }
+
+</script>
+<script>
+
+
+    function toMyCollect() {
+        var token = localStorage.getItem("token");
+        if (token) {
+            window.location.href = "/book/search?token=" + token;
+        } else {
+            window.location.href = "/user/login.html";
+        }
+    }
+</script>
+
+
+</html>

novel-front/src/main/resources/templates/mobile/user/register.html

@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title>注册</title>
+
+    <div th:include="mobile/common/css :: css"></div>
+
+
+</head>
+<body id="read">
+
+<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+
+    <div style="width:10%;float: left;margin-left: 10px">
+        <a href="javascript:history.go(-1)">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+    </div>
+    <b class="layui-icon">注册</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+    </a>
+    </div>
+</div>
+<form lay-filter="loginForm" id="form1" style="height: 500px;padding-top:30px;padding-right: 20px" class="layui-form" action="">
+    <input type="hidden" id="bookIdHidden" name="bookId" th:value="${bookId}"/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">手机号码</label>
+        <div class="layui-input-inline">
+            <input name="txtUName" type="text" id="txtUName"  placeholder="请输入手机号"
+                   autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">密码</label>
+        <div class="layui-input-inline">
+            <input name="txtPassword" type="password" id="txtPassword"  placeholder="请输入密码"
+                   autocomplete="off" class="layui-input">
+        </div>
+
+    </div>
+    <div class="layui-form-item ">
+        <label class="layui-form-label">验证码</label>
+        <div class="layui-input-inline">
+            <input name="txtUName" type="text" id="TxtChkCode"  placeholder="请输入验证码"
+                   autocomplete="off" class="layui-input">
+        </div>
+        <div class="layui-input-inline"><img
+                style="border: 1px solid #eee" class="code_pic" src="" id="chkd"
+                onclick="getVerify(this);"/></div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <input type="button" value="注册" id="btnRegister" class="layui-btn" />
+            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+        </div>
+    </div>
+</form>
+
+
+<div th:replace="mobile/common/footer :: footer">
+</div>
+</body>
+<div th:replace="mobile/common/js :: js">
+</div>
+<script type="text/javascript">
+    $("#form1").css("min-height",($(window).height() - 140)+"px")
+    $("#chkd").click();
+   
+    $("#btnRegister").click(function () {
+        var username = $("#txtUName").val();
+        if (username.isBlank()) {
+            layer.alert("手机号不能为空！");
+            return;
+        }
+        if (!username.isPhone()) {
+            layer.alert("手机号格式不正确！");
+            return;
+        }
+        var password = $("#txtPassword").val();
+        if (password.isBlank()) {
+            layer.alert("密码不能为空！");
+            return;
+        }
+        var velCode = $("#TxtChkCode").val();
+        if (velCode.isBlank()) {
+            layer.alert("验证码不能为空！");
+            return;
+        }
+        $.ajax({
+            type: "POST",
+            url: "/user/register",
+            data: {"username": username, "password": password,"velCode":velCode},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    $.cookie('Authorization', data.data.token, {path: '/'});
+                    window.location.href="/";
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    })
+    //获取验证码
+    function getVerify(obj) {
+        obj.src = "/file/getVerify?" + Math.random();
+    }
+</script>
+
+
+
+</html>

novel-front/src/main/resources/templates/mobile/user/userinfo.html

@@ -0,0 +1,282 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+
+
+    <title th:text="${application.website.name}"></title>
+
+    <meta name="keywords" th:content="${application.website.keyword}"/>
+    <meta name="description"
+          th:content="${application.website.description}"/>
+
+
+    <div th:include="mobile/common/css :: css"></div>
+
+    <style>
+
+        .line-limit-length {
+
+            overflow: hidden;
+
+            text-overflow: ellipsis;
+
+            white-space: nowrap;
+
+        }
+
+        .layui-nav .layui-nav-item {
+            position: relative;
+            display: inline-block;
+            vertical-align: middle;
+            line-height: 50px;
+        }
+
+        body ul.layui-nav li.layui-nav-item a {
+            display: block;
+            transition: all .3s;
+            -webkit-transition: all .3s;
+        }
+
+        .user_link {
+            position: relative;
+            display: inline-block;
+            vertical-align: middle;
+            line-height: 50px;
+            padding: 0 20px;
+            color: #fff;
+            float: right;
+        }
+
+        .user_link a {
+
+            color: #fff;
+        }
+
+        .user_big_head {
+            width: 80px;
+            height: 80px;
+            border-radius: 50%;
+        }
+
+    </style>
+
+
+</head>
+<body>
+<div id="body">
+
+    <!-- 你的HTML代码 -->
+    <div style="height: 50px;line-height: 50px;text-align: center"
+         class="layui-header header header-doc  layui-bg-cyan">
+
+        <div style="width:10%;float: left;margin-left: 10px">
+            <a href="javascript:history.go(-1)">
+                <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+        </div>
+        <b class="layui-icon">用户中心</b>
+        <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+        </a>
+        </div>
+    </div>
+
+    <div class="layui-colla-item">
+
+        <div class="layui-container" style="padding: 50px;text-align: center">
+            <img id="imgLogo" class="user_big_head" src="/images/man.png">
+            <div style="padding: 10px;font-size: 18px"><span id="my_name">梦入神机</span>
+                <svg id="boyIcon" style="display: none" t="1693635090733" class="icon" viewBox="0 0 1024 1024"
+                     version="1.1"
+                     xmlns="http://www.w3.org/2000/svg"
+                     p-id="8815" width="15" height="15">
+                    <path d="M872.335 421.516V151.71H602.528L702.949 252.13 601.4 353.68c-46.47-32.81-103.174-52.091-164.385-52.091-157.595 0-285.351 127.756-285.351 285.35S279.421 872.29 437.014 872.29s285.352-127.755 285.352-285.35c0-57.78-17.19-111.537-46.711-156.47l102.818-102.814 93.862 93.861zM437.015 782.18c-107.827 0-195.24-87.413-195.24-195.24s87.413-195.24 195.24-195.24 195.24 87.413 195.24 195.24-87.413 195.24-195.24 195.24z"
+                          fill="#1296DB" p-id="8816"></path>
+                </svg>
+                <svg id="girlIcon" style="display: none" t="1693635698738" class="icon" viewBox="0 0 1024 1024"
+                     version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3685" width="15" height="15">
+                    <path d="M513 636.1c-76.4 0-148.2-29.7-202.2-83.8-54-54-83.8-125.8-83.8-202.2s29.7-148.2 83.8-202.2c54-54 125.8-83.8 202.2-83.8s148.2 29.7 202.2 83.8c54 54 83.8 125.8 83.8 202.2s-29.7 148.2-83.8 202.2c-54 54.1-125.8 83.8-202.2 83.8z m0-515.9c-61.4 0-119.2 23.9-162.6 67.4C307 231 283 288.7 283 350.1s23.9 119.2 67.4 162.6 101.2 67.4 162.6 67.4 119.2-23.9 162.6-67.4S743 411.6 743 350.1 719 231 675.6 187.5c-43.4-43.4-101.2-67.3-162.6-67.3z"
+                          fill="#d4237a" p-id="3686"></path>
+                    <path d="M671.4 712.1H544.7v-104h-56v104H362c-15.5 0-28 12.5-28 28s12.5 28 28 28h126.7v163.3c0 15.5 12.5 28 28 28s28-12.5 28-28V768.1h126.7c15.5 0 28-12.5 28-28s-12.5-28-28-28z"
+                          fill="#d4237a" p-id="3687"></path>
+                </svg>
+            </div>
+            <div style="padding: 5px;">账户余额：<span id="accountBalance" style="color: #f80">3000</span> 屋币</div>
+
+        </div>
+    </div>
+
+
+    <div style="clear: both"></div>
+    <a
+            href="/pay/index.html">
+
+        <div
+                style="background-color:#fafafa;text-align: left;padding:20px 10px 30px;color: #000;font-size: 16px">
+            <div style="float: left;">
+                <svg t="1697073258970" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                     xmlns="http://www.w3.org/2000/svg" p-id="4079" width="25px" height="25px">
+                    <path d="M768 30.72 283.306667 30.72c-51.2 0-98.986667 44.373333-98.986667 98.986667l0 747.52c0 51.2 44.373333 95.573333 98.986667 95.573333l300.373333 0c0 0 71.68 0 116.053333 23.893333 3.413333 0 3.413333 3.413333 6.826667 3.413333 6.826667 0 10.24-3.413333 13.653333-6.826667 3.413333-6.826667 0-17.066667-6.826667-20.48-51.2-30.72-126.293333-30.72-129.706667-30.72L283.306667 942.08c-37.546667 0-64.853333-30.72-64.853333-64.853333L218.453333 129.706667c0-37.546667 30.72-64.853333 64.853333-64.853333l484.693333 0c37.546667 0 68.266667 30.72 68.266667 64.853333l0 747.52c0 37.546667-30.72 64.853333-68.266667 64.853333-6.826667 0-17.066667 6.826667-17.066667 17.066667s6.826667 17.066667 17.066667 17.066667c51.2 0 98.986667-44.373333 98.986667-95.573333L866.986667 129.706667C866.986667 78.506667 819.2 30.72 768 30.72z"
+                          fill="#ff8800" p-id="4080"></path>
+                    <path d="M604.16 102.4 443.733333 102.4c-6.826667 0-17.066667 6.826667-17.066667 17.066667S436.906667 136.533333 443.733333 136.533333l160.426667 0c6.826667 0 17.066667-6.826667 17.066667-17.066667S610.986667 102.4 604.16 102.4z"
+                          fill="#ff8800" p-id="4081"></path>
+                    <path d="M344.746667 307.2c-6.826667 6.826667-6.826667 17.066667 0 20.48l81.92 81.92c3.413333 3.413333 6.826667 3.413333 10.24 3.413333s6.826667 0 10.24-3.413333c6.826667-6.826667 6.826667-17.066667 0-20.48L365.226667 307.2C358.4 300.373333 351.573333 300.373333 344.746667 307.2z"
+                          fill="#ff8800" p-id="4082"></path>
+                    <path d="M604.16 409.6c3.413333 3.413333 6.826667 3.413333 10.24 3.413333s6.826667 0 10.24-3.413333l81.92-81.92c6.826667-6.826667 6.826667-17.066667 0-20.48s-17.066667-6.826667-20.48 0l-81.92 81.92C597.333333 395.946667 597.333333 402.773333 604.16 409.6z"
+                          fill="#ff8800" p-id="4083"></path>
+                    <path d="M716.8 460.8c6.826667 0 17.066667-6.826667 17.066667-17.066667s-6.826667-17.066667-17.066667-17.066667L334.506667 426.666667c-6.826667 0-17.066667 6.826667-17.066667 17.066667s6.826667 17.066667 17.066667 17.066667L512 460.8l0 105.813333L334.506667 566.613333c-6.826667 0-17.066667 6.826667-17.066667 17.066667s6.826667 17.066667 17.066667 17.066667L512 600.746667l0 139.946667c0 6.826667 6.826667 17.066667 17.066667 17.066667s17.066667-6.826667 17.066667-17.066667l0-139.946667L716.8 600.746667c6.826667 0 17.066667-6.826667 17.066667-17.066667s-6.826667-17.066667-17.066667-17.066667l-174.08 0 0-105.813333L716.8 460.8z"
+                          fill="#ff8800" p-id="4084"></path>
+                </svg>
+            </div>
+            <div style="float: left; margin-left: 20px">充值</div>
+            <div style="float: right; margin-right: 20px"><i style="font-size: 14px;color:#666"
+                                                             class="layui-icon">&#xe602;</i>
+            </div>
+        </div>
+    </a>
+
+    <a
+            href="/user/favorites.html">
+
+        <div
+                style="background-color:#fafafa;text-align: left;padding:30px 10px;color: #000;font-size: 16px">
+            <div style="float: left;">
+                <svg t="1693622464904" class="icon" viewBox="0 0 1097 1024" version="1.1"
+                     xmlns="http://www.w3.org/2000/svg" p-id="3653" width="25px" height="25px">
+                    <path d="M998.58390632 852.14701166H126.84569332A41.51236 41.51236 0 0 0 85.33333332 893.65937166v62.26854a41.51236 41.51236 0 0 0 41.51236 41.51236h871.738213a41.51236 41.51236 0 0 0 41.51236-41.51236v-62.26854a41.51236 41.51236 0 0 0-41.51236-41.51236z m-29.293426 83.014048h-813.172704a8.537246 8.537246 0 0 1-8.537246-8.537246v-3.681687a8.537246 8.537246 0 0 1 8.537246-8.537247h813.172704a8.537246 8.537246 0 0 1 8.537246 8.537247v3.681687a8.537246 8.537246 0 0 1-8.537246 8.537246zM126.84569332 810.63465166h124.537079a41.51236 41.51236 0 0 0 41.51236-41.51236V229.47228566a41.51236 41.51236 0 0 0-41.51236-41.51236H126.84569332A41.51236 41.51236 0 0 0 85.33333332 229.47228566v539.650006a41.51236 41.51236 0 0 0 41.51236 41.51236zM156.72605532 246.49342066h64.883071a12.805869 12.805869 0 0 1 12.805869 12.805869v479.995998a12.805869 12.805869 0 0 1-12.805869 12.80587H156.72605532a12.805869 12.805869 0 0 1-12.80587-12.80587V259.29928966a12.805869 12.805869 0 0 1 12.80587-12.805869z m239.939305 564.141231h124.53708a41.51236 41.51236 0 0 0 41.51236-41.51236V278.62548066l291.653674 510.335237 0.266789 0.480221a41.619075 41.619075 0 0 0 56.826045 15.527116l107.932136-62.962191A42.600859 42.600859 0 0 0 1034.18422332 684.02729066L727.73976932 147.49337866l-0.266789-0.48022a41.619075 41.619075 0 0 0-56.826045-15.527116l-107.932135 62.962191V84.17902666A41.51236 41.51236 0 0 0 521.20244032 42.66666666h-124.53708a41.51236 41.51236 0 0 0-41.51236 41.51236v684.943265a41.51236 41.51236 0 0 0 41.51236 41.51236z m296.295802-597.938055a3.735045 3.735045 0 0 1 5.122348 1.376631l259.841761 454.608363a12.805869 12.805869 0 0 1-4.663471 17.415982l-56.271124 32.825712a12.805869 12.805869 0 0 1-17.544041-4.663471L624.11894332 267.59109066a12.805869 12.805869 0 0 1 4.663471-17.415983zM426.49236432 101.20016166h64.883072a12.805869 12.805869 0 0 1 12.805869 12.805869v625.289257a12.805869 12.805869 0 0 1-12.805869 12.80587h-64.883072a12.805869 12.805869 0 0 1-12.805869-12.80587V114.00603066a12.805869 12.805869 0 0 1 12.805869-12.805869z m0 0"
+                          p-id="3654" fill="#ff8800"></path>
+                </svg>
+            </div>
+            <div style="float: left; margin-left: 20px">我的书架</div>
+            <div style="float: right; margin-right: 20px"><i style="font-size: 14px;color:#666"
+                                                             class="layui-icon">&#xe602;</i>
+            </div>
+        </div>
+    </a>
+
+    <a
+            href="/user/read_history.html">
+
+        <div
+                style="background-color:#fafafa;text-align: left;padding:30px 10px 50px;color: #000;font-size: 16px">
+            <div style="float: left;">
+                <svg t="1693621172669" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                     xmlns="http://www.w3.org/2000/svg"
+                     p-id="1877" width="25px" height="25px">
+                    <path d="M876.8 709.12H738.56V591.36c0-15.36-10.24-25.6-25.6-25.6-15.36 0-25.6 10.24-25.6 25.6v143.36c0 15.36 10.24 25.6 25.6 25.6H876.8c15.36 0 25.6-10.24 25.6-25.6s-12.8-25.6-25.6-25.6zM705.28 463.36c-153.6 0-279.04 125.44-279.04 279.04 0 153.6 125.44 279.04 279.04 279.04 153.6 0 279.04-125.44 279.04-279.04 0-153.6-125.44-276.48-279.04-279.04z m0 506.88c-125.44 0-227.84-102.4-227.84-227.84s102.4-227.84 227.84-227.84 227.84 102.4 227.84 227.84c-2.56 128-102.4 227.84-227.84 227.84z m25.6-622.08c0-15.36-10.24-25.6-25.6-25.6h-473.6c-15.36 0-25.6 10.24-25.6 25.6 0 15.36 10.24 25.6 25.6 25.6h473.6c12.8 0 25.6-10.24 25.6-25.6z m-307.2 207.36c0-15.36-10.24-25.6-25.6-25.6h-166.4c-15.36 0-25.6 10.24-25.6 25.6s10.24 25.6 25.6 25.6h166.4c15.36 0 25.6-12.8 25.6-25.6z m-192 153.6c-15.36 0-25.6 10.24-25.6 25.6s10.24 25.6 25.6 25.6h128c15.36 0 25.6-10.24 25.6-25.6s-10.24-25.6-25.6-25.6h-128zM482.56 972.8H90.88V51.2h174.08v38.4c0 33.28 25.6 64 58.88 64 12.8 0 343.04 2.56 373.76 0 33.28 0 58.88-28.16 56.32-61.44v-38.4H928v437.76c0 15.36 10.24 25.6 25.6 25.6 15.36 0 25.6-10.24 25.6-25.6V28.16c0-15.36-10.24-25.6-25.6-25.6H728.32c-15.36 0-25.6 10.24-25.6 25.6v64c0 7.68-5.12 12.8-10.24 12.8H326.4c-7.68 0-12.8-5.12-12.8-12.8V25.6C313.6 10.24 303.36 0 288 0H65.28c-15.36 0-25.6 10.24-25.6 25.6v972.8c0 15.36 10.24 25.6 25.6 25.6h417.28c15.36 0 25.6-10.24 25.6-25.6 0-15.36-12.8-25.6-25.6-25.6zM395.52 51.2h230.4c15.36 0 25.6-10.24 25.6-25.6 0-15.36-10.24-25.6-25.6-25.6h-230.4c-15.36 0-25.6 10.24-25.6 25.6 0 15.36 12.8 25.6 25.6 25.6z"
+                          fill="#ff8800" p-id="1878"></path>
+                </svg>
+            </div>
+            <div style="float: left; margin-left: 20px">阅读历史</div>
+            <div style="float: right; margin-right: 20px"><i style="font-size: 14px;color:#666"
+                                                             class="layui-icon">&#xe602;</i>
+            </div>
+        </div>
+    </a>
+
+    <!--<a
+            href="/user/comment.html">
+
+        <blockquote class="layui-elem-quote"
+                    style="background-color:#fafafa;border-left:0px;margin-bottom: 0px;text-align: left;padding:15px 10px;color: #000;font-size: 18px">
+            <i style="font-size: 25px;padding-right: 20px;color:#f80"
+               class="layui-icon">&#xe611;
+            </i>
+            我的书评
+            <div style="float: right; margin-right: 20px"><i style="font-size: 14px;color:#666"
+                                                             class="layui-icon">&#xe602;</i>
+            </div>
+        </blockquote>
+    </a>-->
+
+
+    <a
+            href="javascript:logout()">
+
+        <blockquote class="layui-elem-quote"
+                    style="background-color:#fafafa;border-left:0px;margin-top:10px;margin-bottom: 10px;text-align: center;padding:15px 10px;color: #f80;font-size: 16px">
+
+            退出登录
+        </blockquote>
+    </a>
+
+</div>
+
+<div th:replace="mobile/common/footer :: footer">
+</div>
+</body>
+
+<div th:replace="mobile/common/js :: js">
+</div>
+
+
+<script>
+    $("#body").css("min-height", ($(window).height() - 50) + "px")
+
+    //查询用户信息
+    $.ajax({
+        type: "get",
+        url: "/user/userInfo",
+        data: {},
+        dataType: "json",
+        success: function (data) {
+            if (data.code == 200) {
+                if (data.data.userPhoto) {
+                    $("#imgLogo").attr("src", data.data.userPhoto);
+                }
+                if (data.data.nickName) {
+                    $("#my_name").html(data.data.nickName);
+                } else {
+                    $("#my_name").html(data.data.username);
+                }
+
+                if (data.data.userSex === '0') {
+                    $("#boyIcon").css("display", "inline")
+                }
+
+                if (data.data.userSex === '1') {
+                    $("#girlIcon").css("display", "inline")
+                }
+
+                $("#accountBalance").html(data.data.accountBalance);
+
+            } else if (data.code == 1001) {
+                //未登录
+                location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+            } else {
+                layer.alert(data.msg);
+            }
+
+        },
+        error: function () {
+            layer.alert('网络异常');
+        }
+    })
+
+
+    function moreNewBooks(event) {
+        window.location.href = "/book/book_ranking.html?sortBy=last_index_update_time";
+    }
+
+    function searchBooks() {
+        var keywords = $("#title").val();
+        window.location.href = "/book/book_ranking.html?keyword=" + encodeURI(keywords);
+    }
+
+    function toMyCollect() {
+        var token = localStorage.getItem("token");
+        if (token) {
+            window.location.href = "/book/book_ranking.html?token=" + token;
+        } else {
+            window.location.href = "/user/login.html";
+        }
+    }
+
+</script>
+
+
+</body>
+</html>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel</artifactId>
-    <version>4.0.0</version>
+    <version>4.2.0</version>
     <modules>
         <module>novel-common</module>
         <module>novel-front</module>
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.8.RELEASE</version>
+        <version>2.1.18.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -29,24 +29,23 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <maven.test.skip>true</maven.test.skip>
-        <mysql.version>8.0.11</mysql.version>
+        <mysql.version>8.0.29</mysql.version>
         <mybatis.version>2.1.4</mybatis.version>
         <mybatis-generator.version>1.4.0</mybatis-generator.version>
         <mybatis-dynamic-sql.version>1.1.4</mybatis-dynamic-sql.version>
-        <pagehelper.version>1.2.5</pagehelper.version>
+        <pagehelper.version>1.4.6</pagehelper.version>
         <orderbyhelper.version>1.0.2</orderbyhelper.version>
         <commons-lang3.version>3.4</commons-lang3.version>
-        <jjwt.version>0.9.0</jjwt.version>
-        <elasticsearch.version>7.9.3</elasticsearch.version>
+        <jjwt.version>0.9.1</jjwt.version>
         <jest.version>6.3.1</jest.version>
         <redis.version>1.4.1.RELEASE</redis.version>
         <redisson.version>3.12.5</redisson.version>
         <sharding.jdbc.version>3.0.0</sharding.jdbc.version>
-        <aliyun-sdk-oss.version>2.4.0</aliyun-sdk-oss.version>
-        <commons-fileupload.version>1.3.1</commons-fileupload.version>
-        <fastdfs-client.version>1.26.1-RELEASE</fastdfs-client.version>
-        <alipay-sdk-java.version>4.9.153.ALL</alipay-sdk-java.version>
+        <aliyun-sdk-oss.version>3.16.3</aliyun-sdk-oss.version>
+        <commons-fileupload.version>1.5</commons-fileupload.version>
+        <alipay-sdk-java.version>4.35.139.ALL</alipay-sdk-java.version>
         <xxyopen.version>1.0.0</xxyopen.version>
+        <jackson.version>2.15.1</jackson.version>
     </properties>
 
     <dependencyManagement>

templates/orange/html/author/index.html

@@ -1,5 +1,5 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!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>
     <head>
@@ -7,16 +7,17 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
         <title>作家管理系统-小说精品屋</title>
         <link rel="stylesheet" href="/css/base.css?v=1"/>
-        <link rel="stylesheet" href="/css/user.css" />
+        <link rel="stylesheet" href="/css/user.css"/>
         <style type="text/css">
-            .redBtn{
+            .redBtn {
                 padding: 5px;
                 border-radius: 20px;
                 border: 1px solid #f80;
                 background: #f80;
                 color: #fff;
             }
-            a.redBtn:hover{
+
+            a.redBtn:hover {
 
                 color: #fff;
             }
@@ -27,7 +28,8 @@
 
 <div class="header">
     <div class="mainNav" id="mainNav">
-        <div class="box_center cf" style="text-align: center;height: 44px;line-height: 48px;color: #fff;font-size: 16px;">
+        <div class="box_center cf"
+             style="text-align: center;height: 44px;line-height: 48px;color: #fff;font-size: 16px;">
 
             小说精品屋作家管理
 
@@ -48,7 +50,7 @@
 
         </div>
         <div class="my_r">
-            <div id="noContentDiv"  >
+            <div id="noContentDiv">
                 <div class="tc" style="margin-top: 200px"><a href="/author/book_add.html" class="btn_red">创建作品</a></div>
 
             </div>
@@ -88,7 +90,6 @@
                         <tbody id="bookList">
 
 
-
                         </tbody>
                     </table>
                     <div class="pageBox cf" id="shellPage">
@@ -148,52 +149,52 @@
         $.ajax({
             type: "get",
             url: "/author/listBookByPage",
-            data: {'curr':curr,'limit':limit},
+            data: {'curr': curr, 'limit': limit},
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {
                     var bookList = data.data.list;
                     if (bookList.length > 0) {
-                        $("#hasContentDiv").css("display","block");
-                        $("#noContentDiv").css("display","none");
+                        $("#hasContentDiv").css("display", "block");
+                        $("#noContentDiv").css("display", "none");
                         var bookListHtml = "";
-                        for(var i=0;i<bookList.length;i++){
+                        for (var i = 0; i < bookList.length; i++) {
                             var book = bookList[i];
-                            bookListHtml+=(" <tr class=\"book_list\" vals=\"291\">\n" +
+                            bookListHtml += (" <tr class=\"book_list\" vals=\"291\">\n" +
                                 /* "                            <td class=\"style bookclass\">\n" +
                                  "                                ["+(i+1)+"]\n" +
                                  "                            </td>\n" +*/
 
                                 "                            <td style=\"position: relative\" class=\"goread\">\n" +
-                                "<input class=\"opacity\" onchange=\"picChange('"+book.id+"')\"\n" +
-                                "                                           type=\"file\" id=\"file0\" name=\"file\"\n" +
+                                "<input class=\"opacity\" onchange=\"picChange('" + book.id + "'," + i + ")\"\n" +
+                                "                                           type=\"file\" id=\"file" + i + "\" name=\"file\"\n" +
                                 "                                           title=\"点击上传图片\"\n" +
                                 "                                           style=\"z-index: 100;cursor: pointer;left: 30px; top: 0px; width: 60px; height: 80px; opacity: 0; position: absolute;  \"\n" +
                                 "                                    />" +
-                                "<img width='50' height='70' src='"+book.picUrl+"'/><br/>" +
-                                "                                "+book.bookName+"</td>\n" +
+                                "<img width='50' height='70' src='" + book.picUrl + "'/><br/>" +
+                                "                                " + book.bookName + "</td>\n" +
 
 
                                 "                            <td class=\"goread\" >"
-                                +book.catName+"</td>\n" +
+                                + book.catName + "</td>\n" +
 
                                 "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
-                                +book.visitCount+"</td>\n" +
+                                + book.visitCount + "</td>\n" +
 
                                 "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
-                                +book.yesterdayBuy+"</td>\n" +
+                                + book.yesterdayBuy + "</td>\n" +
 
                                 "                            <td class=\"goread\">\n" +
-                                "                                "+new Date(Date.parse(book.lastIndexUpdateTime?book.lastIndexUpdateTime:book.updateTime)).Format("yyyy-MM-dd hh:mm")+"更新\n" +
+                                "                                " + new Date(Date.parse(book.lastIndexUpdateTime ? book.lastIndexUpdateTime : book.updateTime)).Format("yyyy-MM-dd hh:mm") + "更新\n" +
                                 "                            </td>\n" +
 
                                 "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
-                                +book.wordCount+"</td>\n" +
+                                + book.wordCount + "</td>\n" +
 
-                                " <td class=\"goread\" id='opt"+book.id+"'>" +
-                                "<a target='_blank' class='redBtn' href='/author/index_list.html?bookId="+book.id+"'>章节管理  </a><br/>" +
-                                "<a target='_blank' href='/author/author_income_detail.html?bookId="+book.id+"'>薪酬查询  </a><br/>"+
-                                "<a target='_blank' href='/book/"+book.id+".html'>作品信息</a>"+
+                                " <td class=\"goread\" id='opt" + book.id + "'>" +
+                                "<a target='_blank' class='redBtn' href='/author/index_list.html?bookId=" + book.id + "'>章节管理  </a><br/>" +
+                                "<a target='_blank' href='/author/author_income_detail.html?bookId=" + book.id + "'>薪酬查询  </a><br/>" +
+                                "<a target='_blank' href='/book/" + book.id + ".html'>作品信息</a>" +
                                 "</td>                     </tr>");
                         }
                         $("#bookList").html(bookListHtml);
@@ -232,7 +233,7 @@
                     //未登录
                     location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
 
-                }else {
+                } else {
                     layer.alert(data.msg);
                 }
 
@@ -245,12 +246,12 @@
     }
 
 
-    function updateBookStatus(bookId,status) {
+    function updateBookStatus(bookId, status) {
 
         $.ajax({
             type: "POST",
             url: "/author/updateBookStatus",
-            data: {'bookId':bookId,'status':status==0?1:0},
+            data: {'bookId': bookId, 'status': status == 0 ? 1 : 0},
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {
@@ -262,7 +263,7 @@
                     //未登录
                     location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
 
-                }else {
+                } else {
                     layer.alert(data.msg);
                 }
 
@@ -273,21 +274,18 @@
         })
 
 
-
-
-
     }
 
 
-    function picChange(bookId) {
-        var file = $("#file0").val(); //文件名称
+    function picChange(bookId, i) {
+        var file = $("#file" + i).val(); //文件名称
         if (file != "") {
-            if(checkPicUpload($("#file0")[0])) {
+            if (checkPicUpload($("#file" + i)[0])) {
 
                 $.ajaxFileUpload({
                     url: "/file/picUpload", //用于文件上传的服务器端请求地址
                     secureuri: false, //是否需要安全协议，一般设置为false
-                    fileElementId: "file0", //文件上传域的ID
+                    fileElementId: "file" + i, //文件上传域的ID
                     dataType: "json", //返回值类型 一般设置为json
                     type: "post",
                     success: function (data) { //服务器成功响应处理函数
@@ -327,7 +325,6 @@
         }
 
 
-
     }
 </script>
 </html>

templates/orange/html/mobile/book/book_detail.html

@@ -5,30 +5,29 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title th:utext="${book.bookName}+'小说最新章节免费阅读和下载'"></title>
 
-    <meta name="keywords" th:content="${book.bookName}+','+${book.bookName}+'最新章节,'+${book.bookName}+'免费阅读,'+${book.bookName}+'TXT下载'">
+    <meta name="keywords"
+          th:content="${book.bookName}+','+${book.bookName}+'最新章节,'+${book.bookName}+'免费阅读,'+${book.bookName}+'TXT下载'">
 
     <meta name="description"
           th:content="${book.bookName}+'最新章节列表,'+${book.bookName}+'最新更新章节免费无广告无弹窗在线阅读,'+${book.bookName}+'小说TXT免费下载。'">
 
 
-
-
     <div th:include="mobile/common/css :: css"></div>
 
     <style type="text/css">
 
-        .indexP p a{
-            color:#4c6978;
+        .indexP p a {
+            color: #4c6978;
         }
 
         .tag-list {
             padding-top: 0px;
             padding-bottom: 20px;
             position: fixed;
-            top:50px;
+            top: 50px;
             right: 0px;
             width: 120px;
-            z-index:100000;
+            z-index: 100000;
         }
 
         .tag-list .tag {
@@ -43,6 +42,7 @@
             margin-right: 8px;
             font-size: 12px;
         }
+
         .tag-list .highlight {
             padding: 5px 9px;
             border: 1px solid #f90;
@@ -53,6 +53,7 @@
         .tag-list .highlight .text {
             color: #f90;
         }
+
         .tag-list .tag .text {
             display: inline-block;
             vertical-align: middle;
@@ -74,6 +75,7 @@
         .tag-list .highlight .icn {
             color: #f90;
         }
+
         .tag-list .tag .icn {
             margin-right: 5px;
             color: #ccc;
@@ -83,6 +85,7 @@
             padding-left: 3px;
             color: #f90;
         }
+
         .tag-list .tag .text {
             display: inline-block;
             vertical-align: middle;
@@ -106,89 +109,98 @@
 <body>
 <div id="content">
 
-<ul class="tag-list clearfix" id="tagLi">
+    <ul class="tag-list clearfix" id="tagLi">
 
-</ul>
+    </ul>
 
 
-<input type="hidden" id="bookIdHidden" th:value="${bookId}"/>
-<input type="hidden" id="bookNamedHidden" th:value="${book.bookName}"/>
+    <input type="hidden" id="bookIdHidden" th:value="${bookId}"/>
+    <input type="hidden" id="bookNamedHidden" th:value="${book.bookName}"/>
     <input type="hidden" id="preContentId" th:value="${firstBookIndexId}"/>
 
-<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+    <div style="height: 50px;line-height: 50px;text-align: center"
+         class="layui-header header header-doc  layui-bg-cyan">
 
-    <div style="float: left;margin-left: 10px">
-        <a href="javascript:history.go(-1)">
-            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+        <div style="float: left;margin-left: 10px">
+            <a href="javascript:history.go(-1)">
+                <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+        </div>
+        <b class="layui-icon" th:utext="${book.bookName}"></b>
+        <div style="float: right;margin-right: 10px">
+            <a href="/"><i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i></a>
+        </div>
     </div>
-    <b class="layui-icon" th:utext="${book.bookName}"></b>
-    <div style="float: right;margin-right: 10px">
-        <a href="/"><i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i></a>
-    </div>
-</div>
 
-<div class="layui-row" style="background: #f2f2f2">
-    <div style="padding: 3px" class="layui-col-xs4 layui-col-sm2 layui-col-md2 layui-col-lg2">
-        <img style=" width:130px; height:auto; max-width:100%; max-height:100%;" th:src="${book.picUrl}"/>
+    <div class="layui-row" style="background: #f2f2f2">
+        <div style="padding: 3px" class="layui-col-xs4 layui-col-sm2 layui-col-md2 layui-col-lg2">
+            <img style=" width:130px; height:auto; max-width:100%; max-height:100%;" th:src="${book.picUrl}"/>
 
-    </div>
-        <div style="position:relative;padding: 3px 10px 0px" class="layui-col-xs8 layui-col-sm8 layui-col-md8 layui-col-lg8">
-            <a th:href="'javascript:searchBooks(\''+ ${book.authorName}+'\')'"><div style=";color: #444;" th:utext="'作者：'+ ${book.authorName}"></div></a>
-            <a th:href="'/book/book_ranking.html?catId='+${book.catId}"><div style="margin-top: 5px;color: #444;" th:text="'类别：'+ ${book.catName}"></div></a>
+        </div>
+        <div style="position:relative;padding: 3px 10px 0px"
+             class="layui-col-xs8 layui-col-sm8 layui-col-md8 layui-col-lg8">
+            <a th:href="'javascript:searchBooks(\''+ ${book.authorName}+'\')'">
+                <div style=";color: #444;" th:utext="'作者：'+ ${book.authorName}"></div>
+            </a>
+            <a th:href="'/book/book_ranking.html?catId='+${book.catId}">
+                <div style="margin-top: 5px;color: #444;" th:text="'类别：'+ ${book.catName}"></div>
+            </a>
             <div style="margin-top: 5px;color: #444;" th:text="'状态：'+ ${book.bookStatus==0?'连载':'完结'}"></div>
-            <div style="margin-top: 5px;color: #444;">更新：<i  th:text="${#dates.format(book.lastIndexUpdateTime, 'yy-MM-dd')}"></i></div>
-            <div style="margin-top: 5px;color: #444;">评分：<i style="font-weight:bold;color: red" th:text="${book.score} + '分'"></i></div>
-            <div style="margin-top: 5px;color: #444;">点击：<i style="font-weight:bold;color: red" th:text="${book.visitCount}"></i></div>
+            <div style="margin-top: 5px;color: #444;">更新：<i
+                    th:text="${#dates.format(book.lastIndexUpdateTime, 'yy-MM-dd')}"></i></div>
+            <div style="margin-top: 5px;color: #444;">评分：<i style="font-weight:bold;color: red"
+                                                            th:text="${book.score} + '分'"></i></div>
+            <div style="margin-top: 5px;color: #444;">点击：<i style="font-weight:bold;color: red"
+                                                            th:text="${book.visitCount}"></i></div>
 
 
         </div>
     </div>
 
 
+    <div style="text-align: center;height: 45px;line-height: 45px">
+        <a th:href="'/book/'+${book.id}+'/'+${firstBookIndexId}+'.html'" type="button"
+           style="background-color:#ff8900!important" class="layui-btn layui-btn-sm layui-btn-radius">开始阅读</a>
+        <button type="button" id="cFavs" onclick="addInShell()"
+                style="border: 1px solid #f80;color: #f80;background-color:#fff!important"
+                class="layui-btn layui-btn-sm layui-btn-radius ">加入书架
+        </button>
 
-<div style="text-align: center;height: 45px;line-height: 45px">
-    <a th:href="'/book/'+${book.id}+'/'+${firstBookIndexId}+'.html'"  type="button" style="background-color:#ff8900!important" class="layui-btn layui-btn-sm layui-btn-radius">开始阅读</a>
-    <button type="button" id="cFavs" onclick="addInShell()" style="background-color:#ffA640!important" class="layui-btn layui-btn-sm layui-btn-radius ">加入书架</button>
+        <!--
+            <button type="button" onclick="downloadFile()" class="layui-btn layui-btn-sm layui-btn-radius layui-bg-normal">下载TXT</button>
+        -->
+    </div>
+    <p style="line-height: 23px;padding: 10px;font-size: 14px;color: #333;" th:utext="${book.bookDesc}">
 
-    <button type="button" onclick="location.href='/user/favorites.html'" style="background-color:#ffBE73!important" class="layui-btn layui-btn-sm layui-btn-radius ">我的书架</button>
-<!--
-    <button type="button" onclick="downloadFile()" class="layui-btn layui-btn-sm layui-btn-radius layui-bg-normal">下载TXT</button>
--->
-</div>
-<p style="line-height: 23px;padding: 10px;font-size: 14px;color: #333;" th:utext="${book.bookDesc}">
+    </p>
 
-</p>
-
-<div class="layui-collapse">
-    <div class="layui-colla-item" >
-        <h2 class="layui-colla-title">
-            <span>最新章节</span>
-            <span style="margin-left: 30px">
+    <div class="layui-collapse">
+        <div class="layui-colla-item">
+            <h2 class="layui-colla-title">
+                <span>最新章节</span>
+                <span style="margin-left: 30px">
                 更新： <i th:text="${#dates.format(book.lastIndexUpdateTime, 'yy-MM-dd HH:mm:ss')}"></i>
             </span>
-        </h2>
-        <div class="layui-colla-content layui-show indexP layui-row" id="indexList">
-
+            </h2>
+            <div class="layui-colla-content layui-show indexP layui-row" id="indexList">
 
 
+            </div>
         </div>
     </div>
-</div>
-<div style="height: 42px;color:#4c6978;line-height: 42px;padding-left: 30px;background: #f2f2f2" >
+    <div style="height: 42px;color:#4c6978;line-height: 42px;padding-left: 30px;background: #f2f2f2">
 
-    <a th:href="'/book/indexList-'+${book.id}+'.html'">查看完整目录</a>
-</div>
+        <a th:href="'/book/indexList-'+${book.id}+'.html'">查看完整目录</a>
+    </div>
 
-<!--
-<div style="position: fixed;top:0px;left:0px;z-index:-100;opacity: 0" th:utext="${attacDivForSearch}"></div>
--->
+    <!--
+    <div style="position: fixed;top:0px;left:0px;z-index:-100;opacity: 0" th:utext="${attacDivForSearch}"></div>
+    -->
 </div>
 
 <div th:replace="mobile/common/footer :: footer">
 </div>
 
 
-
 </body>
 <div th:replace="mobile/common/js :: js">
 </div>
@@ -202,7 +214,7 @@
         success: function (data) {
             if (data.code == 200) {
                 if (data.data) {
-                    $("#cFavs").html("<button type=\"button\" id=\"cFavs\"  class=\"layui-btn layui-btn-sm layui-btn-radius layui-btn-warm\">已在书架</button>");
+                    $("#cFavs").replaceWith("<button type=\"button\" id=\"cFavs\" style=\"border: 1px solid #f80;color: #f80;background-color:#fff!important\"  class=\"layui-btn layui-btn-sm layui-btn-radius layui-btn-warm\">已在书架</button>");
                 }
 
 
@@ -228,15 +240,14 @@
         success: function (data) {
             if (data.code == 200) {
                 var indexListHtml = "";
-                for(var i = 0 ; i < data.data.length ; i++){
+                for (var i = 0; i < data.data.length; i++) {
                     var bookIndex = data.data[i];
-                    indexListHtml+=("<p class=\"line-limit-length layui-col-xs12 layui-col-sm4 layui-col-md3 layui-col-lg2\" style=\"padding-left:10px;height: 50px;line-height: 50px;\"><a href=\"/book/"+$("#bookIdHidden").val()+"/"+bookIndex.id+".html\" style='color: #333'>"+bookIndex.indexName+"</a></p>");
+                    indexListHtml += ("<p class=\"line-limit-length layui-col-xs12 layui-col-sm4 layui-col-md3 layui-col-lg2\" style=\"padding-left:10px;height: 50px;line-height: 50px;\"><a href=\"/book/" + $("#bookIdHidden").val() + "/" + bookIndex.id + ".html\" style='color: #333'>" + bookIndex.indexName + "</a></p>");
                 }
 
                 $("#indexList").html(indexListHtml);
 
 
-
             } else if (data.code == 1001) {
                 //未登录
 
@@ -258,7 +269,7 @@
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {
-                        $("#cFavs").html("<button type=\"button\" id=\"cFavs\"  class=\"layui-btn layui-btn-sm layui-btn-radius layui-btn-warm\">已在书架</button>");
+                    $("#cFavs").replaceWith("<button type=\"button\" id=\"cFavs\" style=\"border: 1px solid #f80;color: #f80;background-color:#fff!important\"  class=\"layui-btn layui-btn-sm layui-btn-radius layui-btn-warm\">已在书架</button>");
 
 
                 } else if (data.code == 1001) {
@@ -278,59 +289,54 @@
     }
 
 
-
-
-    $("#content").css("min-height",($(window).height()-60)+"px");
+    $("#content").css("min-height", ($(window).height() - 60) + "px");
 
     function downloadFile() {
-        var fileUrl = '/book/download?bookId='+$("#bookIdHidden").val()+'&bookName='+$("#bookNamedHidden").val();
-        window.location.href=fileUrl;
+        var fileUrl = '/book/download?bookId=' + $("#bookIdHidden").val() + '&bookName=' + $("#bookNamedHidden").val();
+        window.location.href = fileUrl;
 
 
     }
 
 
-
-
-    function toMyCollect(){
+    function toMyCollect() {
         var token = localStorage.getItem("token");
-        if(token) {
+        if (token) {
             window.location.href = "/book/search?token=" + token;
-        }else{
+        } else {
             window.location.href = "/user/login.html";
         }
     }
 
-    function addToCollect(){
+    function addToCollect() {
         var token = localStorage.getItem("token");
 
-        if(token) {
-            $.get("/user/addToCollect",{"bookId":$("#bookIdHidden").val(),"token":token},function(data){
-                    layer.alert(data.desc);
-                    if(data.code == 1) {
-                        $('#collectButton').unbind("click");
-                        $("#collectButton").text("撤下书架");
-                        $("#collectButton").click(function () {
-                            cancelToCollect();
-                        });
-                    }
+        if (token) {
+            $.get("/user/addToCollect", {"bookId": $("#bookIdHidden").val(), "token": token}, function (data) {
+                layer.alert(data.desc);
+                if (data.code == 1) {
+                    $('#collectButton').unbind("click");
+                    $("#collectButton").text("撤下书架");
+                    $("#collectButton").click(function () {
+                        cancelToCollect();
+                    });
+                }
             });
-        }else{
-            window.location.href = "/user/login.html?bookId="+$("#bookIdHidden").val();
+        } else {
+            window.location.href = "/user/login.html?bookId=" + $("#bookIdHidden").val();
         }
 
 
-
     }
 
 
-    function cancelToCollect(){
+    function cancelToCollect() {
         var token = localStorage.getItem("token");
 
-        if(token) {
-            $.get("/user/cancelToCollect",{"bookId":$("#bookIdHidden").val(),"token":token},function(data){
-                    layer.alert(data.desc);
-                if(data.code == 1) {
+        if (token) {
+            $.get("/user/cancelToCollect", {"bookId": $("#bookIdHidden").val(), "token": token}, function (data) {
+                layer.alert(data.desc);
+                if (data.code == 1) {
                     $('#collectButton').unbind("click");
                     $("#collectButton").text("加入书架");
                     $("#collectButton").click(function () {
@@ -339,8 +345,8 @@
                 }
 
             });
-        }else{
-            window.location.href = "/user/login.html?bookId="+$("#bookIdHidden").val();
+        } else {
+            window.location.href = "/user/login.html?bookId=" + $("#bookIdHidden").val();
         }
 
     }

templates/orange/html/mobile/common/js.html

@@ -1,3 +1,3 @@
 <script th:fragment="js" src="/mobile/js/jquery-1.9.1.js"></script>
-<script th:fragment="js" src="/mobile/js/common.js"></script>
 <script th:fragment="js" src="/mobile/layui/layui.all.js"></script>
+<script th:fragment="js" src="/mobile/js/common.js"></script>

templates/orange/html/mobile/index.html

@@ -40,6 +40,21 @@
             -webkit-transition: all .3s;
         }
 
+        .user_link {
+            position: relative;
+            display: inline-block;
+            vertical-align: middle;
+            line-height: 50px;
+            padding: 0 5px;
+            color: #fff;
+            float: right;
+        }
+
+        .user_link a {
+
+            color: #fff;
+        }
+
     </style>
 
 
@@ -85,7 +100,7 @@
             <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=7">女频小说</a></dd>
         </dl>
     </li>
-    <li class="layui-nav-item"><a href="/user/favorites.html">书架</a></li>
+    <li class="user_link"></li>
 
 </ul>
 <ul class="layui-nav pc" lay-filter="" style="padding:0 36px;text-align: center">
@@ -120,9 +135,12 @@
             <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=7">女频小说</a></dd>
         </dl>
     </li>
+    <li class="user_link"></li>
+
 
 </ul>
 
+
 <div class="layui-container">
     <div class="layui-row">
 
@@ -170,7 +188,8 @@
 
         <div class="layui-container">
             <div class="layui-row" id="hotRecBooks" th:if="${bookMap['3']}">
-                <div th:each="book,iterStat : ${bookMap['3']}" th:if="${iterStat.index<6}" style="margin-bottom: 5px" class="layui-col-xs12 layui-col-sm6 layui-col-md4 layui-col-lg4">
+                <div th:each="book,iterStat : ${bookMap['3']}" th:if="${iterStat.index<6}" style="margin-bottom: 5px"
+                     class="layui-col-xs12 layui-col-sm6 layui-col-md4 layui-col-lg4">
                     <a th:href="'/book/'+${book.bookId}+'.html'">
                         <div class="layui-col-xs5 layui-col-sm4 layui-col-md4 layui-col-lg4">
                             <img style=" width:100px; height:125px;" th:src="${book.picUrl}">
@@ -178,11 +197,15 @@
                         </div>
                         <div class="layui-col-xs5 layui-col-sm6 layui-col-md6 layui-col-lg6">
                             <ul>
-                                <li style="padding-bottom: 2px" class="line-limit-length" th:text="${book.bookName}"></li>
+                                <li style="padding-bottom: 2px" class="line-limit-length"
+                                    th:text="${book.bookName}"></li>
                                 <li style="padding-bottom: 2px;color: #a6a6a6" th:text="'作者：'+${book.authorName}"></li>
-                                <li style="color: #a6a6a6;width: 180px;height:60px;overflow: hidden" th:utext="${book.bookDesc}">                                </li></ul>
+                                <li style="color: #a6a6a6;width: 180px;height:60px;overflow: hidden"
+                                    th:utext="${book.bookDesc}"></li>
+                            </ul>
                         </div>
-                        <div style="font-style: italic;color: red" class="layui-col-xs2 layui-col-sm2 layui-col-md2 layui-col-lg2"></div>
+                        <div style="font-style: italic;color: red"
+                             class="layui-col-xs2 layui-col-sm2 layui-col-md2 layui-col-lg2"></div>
                     </a>
                 </div>
 

templates/orange/html/mobile/pay/index.html

@@ -0,0 +1,212 @@
+<!DOCTYPE html>
+<html lang="en">
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title th:text="${application.website.name}+'列表'"></title>
+
+    <meta name="keywords"
+          th:content="${application.website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">
+
+    <meta name="description"
+          th:content="${application.website.name}+'是国内优秀的小说弹幕网站,'+${application.website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">
+
+
+    <div th:include="mobile/common/css :: css"></div>
+
+    <style type="text/css">
+
+
+        .line-limit-length {
+
+            overflow: hidden;
+
+            text-overflow: ellipsis;
+
+            white-space: nowrap;
+
+        }
+
+        .indexP p a {
+            color: #4c6978;
+        }
+
+        .Readarea {
+            font-size: 18px;
+            line-height: 35px;
+            padding: 10px;
+            color: #333;
+        }
+
+        div, p {
+            wrap-work: break-word;
+            word-break: break-all;
+            word-wrap: break-word;
+            word-break: normal;
+            -moz-box-sizing: border-box;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            -ms-box-sizing: border-box;
+        }
+
+        .indexDiv a {
+            margin-left: 20px;
+        }
+
+        img {
+            width: 130px;
+            height: 180px;
+        }
+        .payHead {
+            height: 36px;
+            line-height: 36px;
+            padding: 20px 0 50px;
+            margin: 0 24px;
+            font-size: 16px;
+            border-bottom: 1px solid #eaeaea;
+            zoom: 1;
+        }
+        .pay_way li {
+            text-align: center;
+            cursor: pointer;
+            border: 2px solid #eee;
+            margin: 20px 0px 3px 43px;
+            padding-top: 20px;
+            padding-bottom: 20px;
+        }
+
+    </style>
+</head>
+<body>
+
+
+<input type="hidden" id="limit" th:value="${limit}"/>
+<input type="hidden" id="curr" th:value="${curr}"/>
+<input type="hidden" id="total" th:value="${total}"/>
+<input type="hidden" id="ids" th:value="${ids}"/>
+<input type="hidden" id="bookStatus" th:value="${bookStatus}"/>
+<input type="hidden" id="token" th:value="${token}"/>
+<input type="hidden" id="keyword" th:value="${keyword}"/>
+<input type="hidden" id="catId" th:value="${catId}"/>
+<input type="hidden" id="sortBy" th:value="${sortBy}"/>
+<input type="hidden" id="sort" th:value="${sort}"/>
+
+<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+
+    <div style="width:10%;float: left;margin-left: 10px">
+        <a href="javascript:history.go(-1)">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+    </div>
+    <b class="layui-icon">充值</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+    </a>
+    </div>
+</div>
+<div id="body" class="layui-row">
+    <div class="payHead cf">
+        <div class="fl">
+            充值账号：<span class="user_name" id="my_name">13560421324</span>&nbsp;&nbsp;&nbsp;&nbsp;余额：<em style="color: #f80" id="accountBalance">10</em> 屋币<!--<em class="red">+0</em>代金券-->
+        </div>
+    </div>
+    <div id="payAmount" class="pay_way layui-row layui-col-space15" style="text-align: center;padding-top: 20px;">
+        <h5>选择充值金额</h5>
+        <li vals="10" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>10元</strong><br><span class="pay_mn">1000屋币</span></div>
+            </div>
+        </li>
+        <li vals="30"  class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>30元</strong><br><span class="pay_mn">3000屋币</span></div>
+            </div>
+        </li>
+        <li vals="50" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>50元</strong><br><span class="pay_mn">5000屋币</span></div>
+            </div>
+        </li>
+        <li vals="100" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>100元</strong><br><span class="pay_mn">10000屋币</span></div>
+            </div>
+        </li>
+        <li vals="200" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>200元</strong><br><span class="pay_mn">20000屋币</span></div>
+            </div>
+        </li>
+        <li vals="500" class="layui-col-xs4 layui-col-sm3 layui-col-md2">
+            <div class="layui-panel">
+                <div ><strong>500元</strong><br><span class="pay_mn">50000屋币</span></div>
+            </div>
+        </li>
+
+    </div>
+
+    <form action="/pay/aliPay" method="post" id="payform" name="payform">
+
+        <input type="hidden" id="pValue" name="payAmount"  />
+    </form>
+
+
+</div>
+<div th:replace="mobile/common/footer :: footer">
+</div>
+
+<a name="buttom"></a>
+</body>
+
+<div th:replace="mobile/common/js :: js"></div>
+
+<script>
+    $("#body").css("min-height",($(window).height() - 100)+"px")
+
+    //查询用户信息
+    $.ajax({
+        type: "get",
+        url: "/user/userInfo",
+        data: {},
+        dataType: "json",
+        success: function (data) {
+            if (data.code == 200) {
+                if(data.data.nickName){
+                    $("#my_name").html(data.data.nickName);
+                }else{
+                    $("#my_name").html(data.data.username);
+                }
+
+                $("#accountBalance").html(data.data.accountBalance);
+
+            } else if (data.code == 1001) {
+                //未登录
+                location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+            } else {
+                layer.alert(data.msg);
+            }
+
+        },
+        error: function () {
+            layer.alert('网络异常');
+        }
+    })
+
+    $("#payAmount").find("li").click(function () {
+
+        $("#pValue").val($(this).attr("vals"));
+
+        $("#payform").submit();
+
+
+
+    });
+
+
+</script>
+
+
+
+</html>

templates/orange/html/mobile/user/favorites.html

@@ -0,0 +1,268 @@
+<!DOCTYPE html>
+<html lang="en">
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title th:text="${application.website.name}+'列表'"></title>
+
+    <meta name="keywords"
+          th:content="${application.website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">
+
+    <meta name="description"
+          th:content="${application.website.name}+'是国内优秀的小说弹幕网站,'+${application.website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">
+
+
+    <div th:include="mobile/common/css :: css"></div>
+
+    </div>
+
+    <style type="text/css">
+
+
+        .line-limit-length {
+
+            overflow: hidden;
+
+            text-overflow: ellipsis;
+
+            white-space: nowrap;
+
+        }
+
+        .indexP p a {
+            color: #4c6978;
+        }
+
+        .Readarea {
+            font-size: 18px;
+            line-height: 35px;
+            padding: 10px;
+            color: #333;
+        }
+
+        div, p {
+            wrap-work: break-word;
+            word-break: break-all;
+            word-wrap: break-word;
+            word-break: normal;
+            -moz-box-sizing: border-box;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            -ms-box-sizing: border-box;
+        }
+
+        .indexDiv a {
+            margin-left: 20px;
+        }
+
+        img {
+            width: 130px;
+            height: 180px;
+        }
+    </style>
+</head>
+<body>
+
+
+<input type="hidden" id="limit" th:value="${limit}"/>
+<input type="hidden" id="curr" th:value="${curr}"/>
+<input type="hidden" id="total" th:value="${total}"/>
+<input type="hidden" id="ids" th:value="${ids}"/>
+<input type="hidden" id="bookStatus" th:value="${bookStatus}"/>
+<input type="hidden" id="token" th:value="${token}"/>
+<input type="hidden" id="keyword" th:value="${keyword}"/>
+<input type="hidden" id="catId" th:value="${catId}"/>
+<input type="hidden" id="sortBy" th:value="${sortBy}"/>
+<input type="hidden" id="sort" th:value="${sort}"/>
+
+<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+
+    <div style="width:10%;float: left;margin-left: 10px">
+        <a href="javascript:history.go(-1)">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+    </div>
+    <b class="layui-icon">我的书架</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+    </a>
+    </div>
+</div>
+<div id="body">
+<div id="bookList">
+
+
+</div>
+
+
+<div id="books" style="text-align: center;"></div>
+
+</div>
+<div th:replace="mobile/common/footer :: footer">
+</div>
+
+<a name="buttom"></a>
+</body>
+
+<div th:replace="mobile/common/js :: js"></div>
+
+<script>
+    $("#body").css("min-height",($(window).height() - 110)+"px")
+
+    search(1,20);
+
+    function search(curr,limit) {
+
+
+        $.ajax({
+            type: "get",
+            url: "/user/listBookShelfByPage",
+            data: {'curr':curr,'limit':limit},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    var bookList = data.data.list;
+                    var bookListHtml = "";
+                    for (var i = 0; i < bookList.length; i++) {
+                        var book = bookList[i];
+
+                        /*var end = book.bookDesc.indexOf("<");
+                        if(end != -1) {
+                            book.bookDesc = book.bookDesc.substring(0,end);
+                        }*/
+
+                        if(book.bookDesc){
+                            book.bookDesc = book.bookDesc.replace(/<[^>]+>/g,"").replace(/\s+/g,"").replace(/&nbsp;/g,"");
+                        }
+
+                        bookListHtml += ("<div class=\"layui-row\" style=\"margin-bottom:10px;padding:10px;background: #f2f2f2\">\n" +
+                            "        <a href='/book/"+book.bookId+"/"+book.preContentId+".html'>\n" +
+                            "            <div class=\"layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2\" style=\"text-align: center\">\n" +
+                            "                <img style='width: 130px;height: 180px' align=\"center\"\n" +
+                            "                     src=\""+book.picUrl+"\"/>\n" +
+                            "\n" +
+                            "            </div>\n" +
+                            "        </a>\n" +
+                            "        <div style=\"padding: 10px\" class=\"layui-col-xs6 layui-col-sm8 layui-col-md8 layui-col-lg8\">\n" +
+                            "            <a href='/book/"+book.bookId+"/"+book.preContentId+".html'>\n" +
+                            "                <div class=\"line-limit-length\" style=\";color: #000;font-size: 15px\">"+book.bookName+"</div>\n" +
+                            "            </a>\n" +
+                            "            <div style=\";color: #4c6978;float: right;\"><i style=\"color: red\"></i></div>\n" +
+                            "            <a href='/book/"+book.bookId+"/"+book.preContentId+".html'>\n" +
+                            "                <div style=\";color: #a6a6a6;\" class=\"line-limit-length\">作者："+book.authorName+"</div>\n" +
+                            "            </a>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">类别："+book.catName+"</div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">状态："+(book.bookStatus==0?'连载':'完结')+"</div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">更新：<i style='color: red'>"+book.lastIndexUpdateTime.substr(0,11)+"</i>\n" +
+                            "            </div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">简介："+(book.bookDesc?(book.bookDesc.length>15?(book.bookDesc.substr(0,15)+"..."):book.bookDesc):book.bookDesc)+"</div>\n" +
+                            "\n" +
+                            "\n" +
+                            "        </div>\n" +
+                            "\n" +
+                            "    </div>");
+                    }
+                    $("#bookList").html(bookListHtml);
+
+                    layui.use('laypage', function () {
+                        var laypage = layui.laypage;
+
+                        //执行一个laypage实例
+                        laypage.render({
+                            elem: 'books' //注意，这里的 test1 是 ID，不用加 # 号
+                            , count: data.data.total //数据总数，从服务端得到,
+                            , curr: data.data.pageNum
+                            , limit: data.data.pageSize
+                            , jump: function (obj, first) {
+
+
+                                //obj包含了当前分页的所有参数，比如：
+                                console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
+                                console.log(obj.limit); //得到每页显示的条数
+
+
+                                //首次不执行
+                                if (!first) {
+                                    search(obj.curr, obj.limit);
+                                } else {
+
+                                }
+                            }
+                        });
+                    });
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
+
+    function searchByAllCondition(curr, limit, newKeyword) {
+        var toUrl = "/book/search?curr=" + curr + "&limit=" + limit;
+        var ids = $("#ids").val();
+        if (ids) {
+            toUrl += ("&historyBookIds=" + ids);
+        }
+        var token = $("#token").val();
+        if (token) {
+            toUrl += ("&token=" + token);
+        }
+        var keyword = $("#keyword").val();
+        if (newKeyword) {
+            toUrl += encodeURI("&keyword=" + newKeyword);
+        } else if (keyword) {
+            toUrl += encodeURI("&keyword=" + keyword);
+        }
+        var bookStatus = $("#bookStatus").val();
+        if (bookStatus) {
+            toUrl += ("&bookStatus=" + bookStatus);
+        }
+        var catId = $("#catId").val();
+        if (catId) {
+            toUrl += ("&catId=" + catId);
+        }
+
+        var sortBy = $("#sortBy").val();
+        if (sortBy) {
+            toUrl += ("&sortBy=" + sortBy);
+        }
+
+        var sort = $("#sort").val();
+        if (sort) {
+            toUrl += ("&sort=" + sort);
+        }
+
+        window.location.href = toUrl;
+    }
+
+    function searchBooks() {
+        var keywords = $("#title").val();
+        $("#keyword").val("");
+        searchByAllCondition(1, 20, keywords);
+    }
+
+</script>
+<script>
+
+
+
+
+    function toMyCollect() {
+        var token = localStorage.getItem("token");
+        if (token) {
+            window.location.href = "/book/search?token=" + token;
+        } else {
+            window.location.href = "/user/login.html";
+        }
+    }
+</script>
+
+
+</html>

templates/orange/html/mobile/user/login.html

@@ -5,109 +5,114 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>登录|注册</title>
-
-    <div th:include="common/css :: css"></div>
+    <title>登录</title>
 
+    <div th:include="mobile/common/css :: css"></div>
 
 
 </head>
-<body id="read" >
-
-</div>
+<body id="read">
 
 <div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
 
-    <div style="float: left;margin-left: 10px">
+    <div style="width:10%;float: left;margin-left: 10px">
         <a href="javascript:history.go(-1)">
-            <i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe65c;</i></a>
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
     </div>
-    <b class="layui-icon">登录|注册</b>
-    <div style="float: right;margin-right: 10px"><a href="/">
-        <i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe68e;</i>
+    <b class="layui-icon">登录</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
     </a>
     </div>
 </div>
-
-<form style="height: 500px;margin-top: 50px" class="layui-form" action="">
+<form lay-filter="loginForm" id="form1" style="height: 500px;padding-top:30px;padding-right: 20px" class="layui-form" action="">
     <input type="hidden" id="bookIdHidden" name="bookId" th:value="${bookId}"/>
     <div class="layui-form-item">
-        <label class="layui-form-label">登录名</label>
-        <div class="layui-input-block">
-            <input type="text" id="loginName" name="loginName" required  lay-verify="required" placeholder="请输入登录名" autocomplete="off" class="layui-input">
+        <label class="layui-form-label">手机号码</label>
+        <div class="layui-input-inline">
+            <input name="txtUName" type="text" id="txtUName"  placeholder="请输入手机号"
+                   autocomplete="off" class="layui-input">
         </div>
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">密码</label>
         <div class="layui-input-inline">
-            <input id="password" type="password" name="password" required lay-verify="required" placeholder="请输入密码" autocomplete="off" class="layui-input">
+            <input name="txtPassword" type="password" id="txtPassword"  placeholder="请输入密码"
+                   autocomplete="off" class="layui-input">
         </div>
-        <div class="layui-form-mid layui-word-aux">如果登录名不存在，则直接注册！</div>
+
     </div>
     <div class="layui-form-item">
         <div class="layui-input-block">
-            <button class="layui-btn" lay-submit lay-filter="formDemo">登录|注册</button>
+            <input id="autoLogin" type="checkbox" lay-skin="primary" title="下次自动登录">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <input type="button" value="登录" id="btnLogin" class="layui-btn" />
             <button type="reset" class="layui-btn layui-btn-primary">重置</button>
         </div>
     </div>
 </form>
 
 
-<div th:replace="common/footer :: footer">
+<div th:replace="mobile/common/footer :: footer">
 </div>
-
-<a name="buttom"></a>
 </body>
-<div th:replace="common/js :: js"></div>
-
-<script>
-    $.get("/book/addVisit",{"bookId":$("#bookIdHidden").val()},function(){});
-
-</script>
-
-<script>
-    //Demo
-    layui.use('form', function(){
-        var form = layui.form;
-
-        //监听提交
-        form.on('submit(formDemo)', function(){
-            $.post("/user/loginOrRegist",{"bookId":$("#bookIdHidden").val(),"loginName":$("#loginName").val(),"password":$("#password").val()},function (data) {
-                if(data.code == 1 || data.code == 2){
-                    localStorage.setItem("token",data.token);
-                    layer.alert(data.desc);
-                    setTimeout(function () {
-                        var bookId = $("#bookIdHidden").val();
-                        if(bookId){
-                            //加入书架
-                            window.location.href="/book/"+bookId+".html";
-                        }else{
-                            //我的书架
-                            window.location.href="/book/search?token="+data.token;
-                        }
-                    },3000)
-
-                }else{
-                    layer.alert(data.desc);
-                }
-            });
-            return false;
-        });
-    });
-</script>
-<script>
-
-
-
-    function toMyCollect(){
-        var token = localStorage.getItem("token");
-        if(token) {
-            window.location.href = "/book/search?token=" + token;
-        }else{
-            window.location.href = "/user/login.html";
-        }
+<div th:replace="mobile/common/js :: js">
+</div>
+<script type="text/javascript">
+    $("#form1").css("min-height",($(window).height() - 140)+"px")
+    if(localStorage.getItem("autoLogin")==1){
+        $("#autoLogin").prop("checked",'true');
+        layui.form.render('checkbox','loginForm');
+    }else{
+        $("#autoLogin").removeAttr("checked");
     }
+    $("#btnLogin").click(function () {
+        var username = $("#txtUName").val();
+        if(username.isBlank()){
+            layer.alert("手机号不能为空！");
+            return;
+        }
+        if(!username.isPhone()){
+            layer.alert("手机号格式不正确！");
+            return;
+        }
+        var password = $("#txtPassword").val();
+        if(password.isBlank()){
+            layer.alert("密码不能为空！");
+            return;
+        }
+        $.ajax({
+            type: "POST",
+            url: "/user/login",
+            data: {"username": username, "password": password},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    if($("#autoLogin").is(':checked')){
+                        $.cookie('Authorization', data.data.token, { expires: 7 ,path: '/'  });
+                        localStorage.setItem("autoLogin","1");
+                    }else {
+                        $.cookie('Authorization', data.data.token,{ path: '/'  });
+                        localStorage.setItem("autoLogin","0");
+                    }
+                    var orginUrl = getSearchString("originUrl");
+                    window.location.href = orginUrl == undefined || orginUrl.isBlank() ? "/" : orginUrl;
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    })
 </script>
 
 
+
 </html>

templates/orange/html/mobile/user/read_history.html

@@ -0,0 +1,266 @@
+<!DOCTYPE html>
+<html lang="en">
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title th:text="${application.website.name}+'列表'"></title>
+
+    <meta name="keywords"
+          th:content="${application.website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">
+
+    <meta name="description"
+          th:content="${application.website.name}+'是国内优秀的小说弹幕网站,'+${application.website.name}+'提供海量热门网络小说,日本轻小说,国产轻小说,动漫小说,轻小说在线阅读和TXT小说下载,致力于网络精品小说的收集,智能计算小说评分,打造小说精品排行榜,致力于无广告无弹窗的小说阅读环境。'">
+
+
+    <div th:include="mobile/common/css :: css"></div>
+
+    </div>
+
+    <style type="text/css">
+
+
+        .line-limit-length {
+
+            overflow: hidden;
+
+            text-overflow: ellipsis;
+
+            white-space: nowrap;
+
+        }
+
+        .indexP p a {
+            color: #4c6978;
+        }
+
+        .Readarea {
+            font-size: 18px;
+            line-height: 35px;
+            padding: 10px;
+            color: #333;
+        }
+
+        div, p {
+            wrap-work: break-word;
+            word-break: break-all;
+            word-wrap: break-word;
+            word-break: normal;
+            -moz-box-sizing: border-box;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            -ms-box-sizing: border-box;
+        }
+
+        .indexDiv a {
+            margin-left: 20px;
+        }
+
+        img {
+            width: 130px;
+            height: 180px;
+        }
+    </style>
+</head>
+<body>
+
+
+<input type="hidden" id="limit" th:value="${limit}"/>
+<input type="hidden" id="curr" th:value="${curr}"/>
+<input type="hidden" id="total" th:value="${total}"/>
+<input type="hidden" id="ids" th:value="${ids}"/>
+<input type="hidden" id="bookStatus" th:value="${bookStatus}"/>
+<input type="hidden" id="token" th:value="${token}"/>
+<input type="hidden" id="keyword" th:value="${keyword}"/>
+<input type="hidden" id="catId" th:value="${catId}"/>
+<input type="hidden" id="sortBy" th:value="${sortBy}"/>
+<input type="hidden" id="sort" th:value="${sort}"/>
+
+<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+
+    <div style="width:10%;float: left;margin-left: 10px">
+        <a href="javascript:history.go(-1)">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+    </div>
+    <b class="layui-icon">阅读历史</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+    </a>
+    </div>
+</div>
+<div id="body">
+    <div id="bookList">
+
+
+    </div>
+
+
+    <div id="books" style="text-align: center;"></div>
+
+</div>
+<div th:replace="mobile/common/footer :: footer">
+</div>
+
+<a name="buttom"></a>
+</body>
+
+<div th:replace="mobile/common/js :: js"></div>
+
+<script>
+    $("#body").css("min-height", ($(window).height() - 110) + "px")
+
+    search(1, 20);
+
+    function search(curr, limit) {
+
+
+        $.ajax({
+            type: "get",
+            url: "/user/listReadHistoryByPage",
+            data: {'curr': curr, 'limit': limit},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    var bookList = data.data.list;
+                    var bookListHtml = "";
+                    for (var i = 0; i < bookList.length; i++) {
+                        var book = bookList[i];
+
+                        /*var end = book.bookDesc.indexOf("<");
+                        if(end != -1) {
+                            book.bookDesc = book.bookDesc.substring(0,end);
+                        }*/
+
+                        if (book.bookDesc) {
+                            book.bookDesc = book.bookDesc.replace(/<[^>]+>/g, "").replace(/\s+/g, "").replace(/&nbsp;/g, "");
+                        }
+
+                        bookListHtml += ("<div class=\"layui-row\" style=\"margin-bottom:10px;padding:10px;background: #f2f2f2\">\n" +
+                            "        <a href='/book/" + book.bookId + "/" + book.preContentId + ".html'>\n" +
+                            "            <div class=\"layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2\" style=\"text-align: center\">\n" +
+                            "                <img style='width: 130px;height: 180px' align=\"center\"\n" +
+                            "                     src=\"" + book.picUrl + "\"/>\n" +
+                            "\n" +
+                            "            </div>\n" +
+                            "        </a>\n" +
+                            "        <div style=\"padding: 10px\" class=\"layui-col-xs6 layui-col-sm8 layui-col-md8 layui-col-lg8\">\n" +
+                            "            <a href='/book/" + book.bookId + "/" + book.preContentId + ".html'>\n" +
+                            "                <div class=\"line-limit-length\" style=\";color: #000;font-size: 15px\">" + book.bookName + "</div>\n" +
+                            "            </a>\n" +
+                            "            <div style=\";color: #4c6978;float: right;\"><i style=\"color: red\"></i></div>\n" +
+                            "            <a href='/book/" + book.bookId + "/" + book.preContentId + ".html'>\n" +
+                            "                <div style=\";color: #a6a6a6;\" class=\"line-limit-length\">作者：" + book.authorName + "</div>\n" +
+                            "            </a>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">类别：" + book.catName + "</div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">状态：" + (book.bookStatus == 0 ? '连载' : '完结') + "</div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">更新：<i style='color: red'>" + book.lastIndexUpdateTime.substr(0, 11) + "</i>\n" +
+                            "            </div>\n" +
+                            "            <div style=\"margin-top: 5px;color: #a6a6a6;\">简介：" + (book.bookDesc ? (book.bookDesc.length > 15 ? (book.bookDesc.substr(0, 15) + "...") : book.bookDesc) : book.bookDesc) + "</div>\n" +
+                            "\n" +
+                            "\n" +
+                            "        </div>\n" +
+                            "\n" +
+                            "    </div>");
+                    }
+                    $("#bookList").html(bookListHtml);
+
+                    layui.use('laypage', function () {
+                        var laypage = layui.laypage;
+
+                        //执行一个laypage实例
+                        laypage.render({
+                            elem: 'books' //注意，这里的 test1 是 ID，不用加 # 号
+                            , count: data.data.total //数据总数，从服务端得到,
+                            , curr: data.data.pageNum
+                            , limit: data.data.pageSize
+                            , jump: function (obj, first) {
+
+
+                                //obj包含了当前分页的所有参数，比如：
+                                console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
+                                console.log(obj.limit); //得到每页显示的条数
+
+
+                                //首次不执行
+                                if (!first) {
+                                    search(obj.curr, obj.limit);
+                                } else {
+
+                                }
+                            }
+                        });
+                    });
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
+
+    function searchByAllCondition(curr, limit, newKeyword) {
+        var toUrl = "/book/search?curr=" + curr + "&limit=" + limit;
+        var ids = $("#ids").val();
+        if (ids) {
+            toUrl += ("&historyBookIds=" + ids);
+        }
+        var token = $("#token").val();
+        if (token) {
+            toUrl += ("&token=" + token);
+        }
+        var keyword = $("#keyword").val();
+        if (newKeyword) {
+            toUrl += encodeURI("&keyword=" + newKeyword);
+        } else if (keyword) {
+            toUrl += encodeURI("&keyword=" + keyword);
+        }
+        var bookStatus = $("#bookStatus").val();
+        if (bookStatus) {
+            toUrl += ("&bookStatus=" + bookStatus);
+        }
+        var catId = $("#catId").val();
+        if (catId) {
+            toUrl += ("&catId=" + catId);
+        }
+
+        var sortBy = $("#sortBy").val();
+        if (sortBy) {
+            toUrl += ("&sortBy=" + sortBy);
+        }
+
+        var sort = $("#sort").val();
+        if (sort) {
+            toUrl += ("&sort=" + sort);
+        }
+
+        window.location.href = toUrl;
+    }
+
+    function searchBooks() {
+        var keywords = $("#title").val();
+        $("#keyword").val("");
+        searchByAllCondition(1, 20, keywords);
+    }
+
+</script>
+<script>
+
+
+    function toMyCollect() {
+        var token = localStorage.getItem("token");
+        if (token) {
+            window.location.href = "/book/search?token=" + token;
+        } else {
+            window.location.href = "/user/login.html";
+        }
+    }
+</script>
+
+
+</html>

templates/orange/html/mobile/user/register.html

@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title>注册</title>
+
+    <div th:include="mobile/common/css :: css"></div>
+
+
+</head>
+<body id="read">
+
+<div style="height: 50px;line-height: 50px;text-align: center" class="layui-header header header-doc  layui-bg-cyan">
+
+    <div style="width:10%;float: left;margin-left: 10px">
+        <a href="javascript:history.go(-1)">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+    </div>
+    <b class="layui-icon">注册</b>
+    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+        <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+    </a>
+    </div>
+</div>
+<form lay-filter="loginForm" id="form1" style="height: 500px;padding-top:30px;padding-right: 20px" class="layui-form" action="">
+    <input type="hidden" id="bookIdHidden" name="bookId" th:value="${bookId}"/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">手机号码</label>
+        <div class="layui-input-inline">
+            <input name="txtUName" type="text" id="txtUName"  placeholder="请输入手机号"
+                   autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">密码</label>
+        <div class="layui-input-inline">
+            <input name="txtPassword" type="password" id="txtPassword"  placeholder="请输入密码"
+                   autocomplete="off" class="layui-input">
+        </div>
+
+    </div>
+    <div class="layui-form-item ">
+        <label class="layui-form-label">验证码</label>
+        <div class="layui-input-inline">
+            <input name="txtUName" type="text" id="TxtChkCode"  placeholder="请输入验证码"
+                   autocomplete="off" class="layui-input">
+        </div>
+        <div class="layui-input-inline"><img
+                style="border: 1px solid #eee" class="code_pic" src="" id="chkd"
+                onclick="getVerify(this);"/></div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <input type="button" value="注册" id="btnRegister" class="layui-btn" />
+            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+        </div>
+    </div>
+</form>
+
+
+<div th:replace="mobile/common/footer :: footer">
+</div>
+</body>
+<div th:replace="mobile/common/js :: js">
+</div>
+<script type="text/javascript">
+    $("#form1").css("min-height",($(window).height() - 140)+"px")
+    $("#chkd").click();
+   
+    $("#btnRegister").click(function () {
+        var username = $("#txtUName").val();
+        if (username.isBlank()) {
+            layer.alert("手机号不能为空！");
+            return;
+        }
+        if (!username.isPhone()) {
+            layer.alert("手机号格式不正确！");
+            return;
+        }
+        var password = $("#txtPassword").val();
+        if (password.isBlank()) {
+            layer.alert("密码不能为空！");
+            return;
+        }
+        var velCode = $("#TxtChkCode").val();
+        if (velCode.isBlank()) {
+            layer.alert("验证码不能为空！");
+            return;
+        }
+        $.ajax({
+            type: "POST",
+            url: "/user/register",
+            data: {"username": username, "password": password,"velCode":velCode},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    $.cookie('Authorization', data.data.token, {path: '/'});
+                    window.location.href="/";
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    })
+    //获取验证码
+    function getVerify(obj) {
+        obj.src = "/file/getVerify?" + Math.random();
+    }
+</script>
+
+
+
+</html>

templates/orange/html/mobile/user/userinfo.html

@@ -0,0 +1,282 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+
+
+    <title th:text="${application.website.name}"></title>
+
+    <meta name="keywords" th:content="${application.website.keyword}"/>
+    <meta name="description"
+          th:content="${application.website.description}"/>
+
+
+    <div th:include="mobile/common/css :: css"></div>
+
+    <style>
+
+        .line-limit-length {
+
+            overflow: hidden;
+
+            text-overflow: ellipsis;
+
+            white-space: nowrap;
+
+        }
+
+        .layui-nav .layui-nav-item {
+            position: relative;
+            display: inline-block;
+            vertical-align: middle;
+            line-height: 50px;
+        }
+
+        body ul.layui-nav li.layui-nav-item a {
+            display: block;
+            transition: all .3s;
+            -webkit-transition: all .3s;
+        }
+
+        .user_link {
+            position: relative;
+            display: inline-block;
+            vertical-align: middle;
+            line-height: 50px;
+            padding: 0 20px;
+            color: #fff;
+            float: right;
+        }
+
+        .user_link a {
+
+            color: #fff;
+        }
+
+        .user_big_head {
+            width: 80px;
+            height: 80px;
+            border-radius: 50%;
+        }
+
+    </style>
+
+
+</head>
+<body>
+<div id="body">
+
+    <!-- 你的HTML代码 -->
+    <div style="height: 50px;line-height: 50px;text-align: center"
+         class="layui-header header header-doc  layui-bg-cyan">
+
+        <div style="width:10%;float: left;margin-left: 10px">
+            <a href="javascript:history.go(-1)">
+                <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe65c;</i></a>
+        </div>
+        <b class="layui-icon">用户中心</b>
+        <div style="width:10%;float: right;margin-right: 10px"><a href="/">
+            <i style="font-size: 20px;color: #fff;" class="layui-icon">&#xe68e;</i>
+        </a>
+        </div>
+    </div>
+
+    <div class="layui-colla-item">
+
+        <div class="layui-container" style="padding: 50px;text-align: center">
+            <img id="imgLogo" class="user_big_head" src="/images/man.png">
+            <div style="padding: 10px;font-size: 18px"><span id="my_name">梦入神机</span>
+                <svg id="boyIcon" style="display: none" t="1693635090733" class="icon" viewBox="0 0 1024 1024"
+                     version="1.1"
+                     xmlns="http://www.w3.org/2000/svg"
+                     p-id="8815" width="15" height="15">
+                    <path d="M872.335 421.516V151.71H602.528L702.949 252.13 601.4 353.68c-46.47-32.81-103.174-52.091-164.385-52.091-157.595 0-285.351 127.756-285.351 285.35S279.421 872.29 437.014 872.29s285.352-127.755 285.352-285.35c0-57.78-17.19-111.537-46.711-156.47l102.818-102.814 93.862 93.861zM437.015 782.18c-107.827 0-195.24-87.413-195.24-195.24s87.413-195.24 195.24-195.24 195.24 87.413 195.24 195.24-87.413 195.24-195.24 195.24z"
+                          fill="#1296DB" p-id="8816"></path>
+                </svg>
+                <svg id="girlIcon" style="display: none" t="1693635698738" class="icon" viewBox="0 0 1024 1024"
+                     version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3685" width="15" height="15">
+                    <path d="M513 636.1c-76.4 0-148.2-29.7-202.2-83.8-54-54-83.8-125.8-83.8-202.2s29.7-148.2 83.8-202.2c54-54 125.8-83.8 202.2-83.8s148.2 29.7 202.2 83.8c54 54 83.8 125.8 83.8 202.2s-29.7 148.2-83.8 202.2c-54 54.1-125.8 83.8-202.2 83.8z m0-515.9c-61.4 0-119.2 23.9-162.6 67.4C307 231 283 288.7 283 350.1s23.9 119.2 67.4 162.6 101.2 67.4 162.6 67.4 119.2-23.9 162.6-67.4S743 411.6 743 350.1 719 231 675.6 187.5c-43.4-43.4-101.2-67.3-162.6-67.3z"
+                          fill="#d4237a" p-id="3686"></path>
+                    <path d="M671.4 712.1H544.7v-104h-56v104H362c-15.5 0-28 12.5-28 28s12.5 28 28 28h126.7v163.3c0 15.5 12.5 28 28 28s28-12.5 28-28V768.1h126.7c15.5 0 28-12.5 28-28s-12.5-28-28-28z"
+                          fill="#d4237a" p-id="3687"></path>
+                </svg>
+            </div>
+            <div style="padding: 5px;">账户余额：<span id="accountBalance" style="color: #f80">3000</span> 屋币</div>
+
+        </div>
+    </div>
+
+
+    <div style="clear: both"></div>
+    <a
+            href="/pay/index.html">
+
+        <div
+                style="background-color:#fafafa;text-align: left;padding:20px 10px 30px;color: #000;font-size: 16px">
+            <div style="float: left;">
+                <svg t="1697073258970" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                     xmlns="http://www.w3.org/2000/svg" p-id="4079" width="25px" height="25px">
+                    <path d="M768 30.72 283.306667 30.72c-51.2 0-98.986667 44.373333-98.986667 98.986667l0 747.52c0 51.2 44.373333 95.573333 98.986667 95.573333l300.373333 0c0 0 71.68 0 116.053333 23.893333 3.413333 0 3.413333 3.413333 6.826667 3.413333 6.826667 0 10.24-3.413333 13.653333-6.826667 3.413333-6.826667 0-17.066667-6.826667-20.48-51.2-30.72-126.293333-30.72-129.706667-30.72L283.306667 942.08c-37.546667 0-64.853333-30.72-64.853333-64.853333L218.453333 129.706667c0-37.546667 30.72-64.853333 64.853333-64.853333l484.693333 0c37.546667 0 68.266667 30.72 68.266667 64.853333l0 747.52c0 37.546667-30.72 64.853333-68.266667 64.853333-6.826667 0-17.066667 6.826667-17.066667 17.066667s6.826667 17.066667 17.066667 17.066667c51.2 0 98.986667-44.373333 98.986667-95.573333L866.986667 129.706667C866.986667 78.506667 819.2 30.72 768 30.72z"
+                          fill="#ff8800" p-id="4080"></path>
+                    <path d="M604.16 102.4 443.733333 102.4c-6.826667 0-17.066667 6.826667-17.066667 17.066667S436.906667 136.533333 443.733333 136.533333l160.426667 0c6.826667 0 17.066667-6.826667 17.066667-17.066667S610.986667 102.4 604.16 102.4z"
+                          fill="#ff8800" p-id="4081"></path>
+                    <path d="M344.746667 307.2c-6.826667 6.826667-6.826667 17.066667 0 20.48l81.92 81.92c3.413333 3.413333 6.826667 3.413333 10.24 3.413333s6.826667 0 10.24-3.413333c6.826667-6.826667 6.826667-17.066667 0-20.48L365.226667 307.2C358.4 300.373333 351.573333 300.373333 344.746667 307.2z"
+                          fill="#ff8800" p-id="4082"></path>
+                    <path d="M604.16 409.6c3.413333 3.413333 6.826667 3.413333 10.24 3.413333s6.826667 0 10.24-3.413333l81.92-81.92c6.826667-6.826667 6.826667-17.066667 0-20.48s-17.066667-6.826667-20.48 0l-81.92 81.92C597.333333 395.946667 597.333333 402.773333 604.16 409.6z"
+                          fill="#ff8800" p-id="4083"></path>
+                    <path d="M716.8 460.8c6.826667 0 17.066667-6.826667 17.066667-17.066667s-6.826667-17.066667-17.066667-17.066667L334.506667 426.666667c-6.826667 0-17.066667 6.826667-17.066667 17.066667s6.826667 17.066667 17.066667 17.066667L512 460.8l0 105.813333L334.506667 566.613333c-6.826667 0-17.066667 6.826667-17.066667 17.066667s6.826667 17.066667 17.066667 17.066667L512 600.746667l0 139.946667c0 6.826667 6.826667 17.066667 17.066667 17.066667s17.066667-6.826667 17.066667-17.066667l0-139.946667L716.8 600.746667c6.826667 0 17.066667-6.826667 17.066667-17.066667s-6.826667-17.066667-17.066667-17.066667l-174.08 0 0-105.813333L716.8 460.8z"
+                          fill="#ff8800" p-id="4084"></path>
+                </svg>
+            </div>
+            <div style="float: left; margin-left: 20px">充值</div>
+            <div style="float: right; margin-right: 20px"><i style="font-size: 14px;color:#666"
+                                                             class="layui-icon">&#xe602;</i>
+            </div>
+        </div>
+    </a>
+
+    <a
+            href="/user/favorites.html">
+
+        <div
+                style="background-color:#fafafa;text-align: left;padding:30px 10px;color: #000;font-size: 16px">
+            <div style="float: left;">
+                <svg t="1693622464904" class="icon" viewBox="0 0 1097 1024" version="1.1"
+                     xmlns="http://www.w3.org/2000/svg" p-id="3653" width="25px" height="25px">
+                    <path d="M998.58390632 852.14701166H126.84569332A41.51236 41.51236 0 0 0 85.33333332 893.65937166v62.26854a41.51236 41.51236 0 0 0 41.51236 41.51236h871.738213a41.51236 41.51236 0 0 0 41.51236-41.51236v-62.26854a41.51236 41.51236 0 0 0-41.51236-41.51236z m-29.293426 83.014048h-813.172704a8.537246 8.537246 0 0 1-8.537246-8.537246v-3.681687a8.537246 8.537246 0 0 1 8.537246-8.537247h813.172704a8.537246 8.537246 0 0 1 8.537246 8.537247v3.681687a8.537246 8.537246 0 0 1-8.537246 8.537246zM126.84569332 810.63465166h124.537079a41.51236 41.51236 0 0 0 41.51236-41.51236V229.47228566a41.51236 41.51236 0 0 0-41.51236-41.51236H126.84569332A41.51236 41.51236 0 0 0 85.33333332 229.47228566v539.650006a41.51236 41.51236 0 0 0 41.51236 41.51236zM156.72605532 246.49342066h64.883071a12.805869 12.805869 0 0 1 12.805869 12.805869v479.995998a12.805869 12.805869 0 0 1-12.805869 12.80587H156.72605532a12.805869 12.805869 0 0 1-12.80587-12.80587V259.29928966a12.805869 12.805869 0 0 1 12.80587-12.805869z m239.939305 564.141231h124.53708a41.51236 41.51236 0 0 0 41.51236-41.51236V278.62548066l291.653674 510.335237 0.266789 0.480221a41.619075 41.619075 0 0 0 56.826045 15.527116l107.932136-62.962191A42.600859 42.600859 0 0 0 1034.18422332 684.02729066L727.73976932 147.49337866l-0.266789-0.48022a41.619075 41.619075 0 0 0-56.826045-15.527116l-107.932135 62.962191V84.17902666A41.51236 41.51236 0 0 0 521.20244032 42.66666666h-124.53708a41.51236 41.51236 0 0 0-41.51236 41.51236v684.943265a41.51236 41.51236 0 0 0 41.51236 41.51236z m296.295802-597.938055a3.735045 3.735045 0 0 1 5.122348 1.376631l259.841761 454.608363a12.805869 12.805869 0 0 1-4.663471 17.415982l-56.271124 32.825712a12.805869 12.805869 0 0 1-17.544041-4.663471L624.11894332 267.59109066a12.805869 12.805869 0 0 1 4.663471-17.415983zM426.49236432 101.20016166h64.883072a12.805869 12.805869 0 0 1 12.805869 12.805869v625.289257a12.805869 12.805869 0 0 1-12.805869 12.80587h-64.883072a12.805869 12.805869 0 0 1-12.805869-12.80587V114.00603066a12.805869 12.805869 0 0 1 12.805869-12.805869z m0 0"
+                          p-id="3654" fill="#ff8800"></path>
+                </svg>
+            </div>
+            <div style="float: left; margin-left: 20px">我的书架</div>
+            <div style="float: right; margin-right: 20px"><i style="font-size: 14px;color:#666"
+                                                             class="layui-icon">&#xe602;</i>
+            </div>
+        </div>
+    </a>
+
+    <a
+            href="/user/read_history.html">
+
+        <div
+                style="background-color:#fafafa;text-align: left;padding:30px 10px 50px;color: #000;font-size: 16px">
+            <div style="float: left;">
+                <svg t="1693621172669" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                     xmlns="http://www.w3.org/2000/svg"
+                     p-id="1877" width="25px" height="25px">
+                    <path d="M876.8 709.12H738.56V591.36c0-15.36-10.24-25.6-25.6-25.6-15.36 0-25.6 10.24-25.6 25.6v143.36c0 15.36 10.24 25.6 25.6 25.6H876.8c15.36 0 25.6-10.24 25.6-25.6s-12.8-25.6-25.6-25.6zM705.28 463.36c-153.6 0-279.04 125.44-279.04 279.04 0 153.6 125.44 279.04 279.04 279.04 153.6 0 279.04-125.44 279.04-279.04 0-153.6-125.44-276.48-279.04-279.04z m0 506.88c-125.44 0-227.84-102.4-227.84-227.84s102.4-227.84 227.84-227.84 227.84 102.4 227.84 227.84c-2.56 128-102.4 227.84-227.84 227.84z m25.6-622.08c0-15.36-10.24-25.6-25.6-25.6h-473.6c-15.36 0-25.6 10.24-25.6 25.6 0 15.36 10.24 25.6 25.6 25.6h473.6c12.8 0 25.6-10.24 25.6-25.6z m-307.2 207.36c0-15.36-10.24-25.6-25.6-25.6h-166.4c-15.36 0-25.6 10.24-25.6 25.6s10.24 25.6 25.6 25.6h166.4c15.36 0 25.6-12.8 25.6-25.6z m-192 153.6c-15.36 0-25.6 10.24-25.6 25.6s10.24 25.6 25.6 25.6h128c15.36 0 25.6-10.24 25.6-25.6s-10.24-25.6-25.6-25.6h-128zM482.56 972.8H90.88V51.2h174.08v38.4c0 33.28 25.6 64 58.88 64 12.8 0 343.04 2.56 373.76 0 33.28 0 58.88-28.16 56.32-61.44v-38.4H928v437.76c0 15.36 10.24 25.6 25.6 25.6 15.36 0 25.6-10.24 25.6-25.6V28.16c0-15.36-10.24-25.6-25.6-25.6H728.32c-15.36 0-25.6 10.24-25.6 25.6v64c0 7.68-5.12 12.8-10.24 12.8H326.4c-7.68 0-12.8-5.12-12.8-12.8V25.6C313.6 10.24 303.36 0 288 0H65.28c-15.36 0-25.6 10.24-25.6 25.6v972.8c0 15.36 10.24 25.6 25.6 25.6h417.28c15.36 0 25.6-10.24 25.6-25.6 0-15.36-12.8-25.6-25.6-25.6zM395.52 51.2h230.4c15.36 0 25.6-10.24 25.6-25.6 0-15.36-10.24-25.6-25.6-25.6h-230.4c-15.36 0-25.6 10.24-25.6 25.6 0 15.36 12.8 25.6 25.6 25.6z"
+                          fill="#ff8800" p-id="1878"></path>
+                </svg>
+            </div>
+            <div style="float: left; margin-left: 20px">阅读历史</div>
+            <div style="float: right; margin-right: 20px"><i style="font-size: 14px;color:#666"
+                                                             class="layui-icon">&#xe602;</i>
+            </div>
+        </div>
+    </a>
+
+    <!--<a
+            href="/user/comment.html">
+
+        <blockquote class="layui-elem-quote"
+                    style="background-color:#fafafa;border-left:0px;margin-bottom: 0px;text-align: left;padding:15px 10px;color: #000;font-size: 18px">
+            <i style="font-size: 25px;padding-right: 20px;color:#f80"
+               class="layui-icon">&#xe611;
+            </i>
+            我的书评
+            <div style="float: right; margin-right: 20px"><i style="font-size: 14px;color:#666"
+                                                             class="layui-icon">&#xe602;</i>
+            </div>
+        </blockquote>
+    </a>-->
+
+
+    <a
+            href="javascript:logout()">
+
+        <blockquote class="layui-elem-quote"
+                    style="background-color:#fafafa;border-left:0px;margin-top:10px;margin-bottom: 10px;text-align: center;padding:15px 10px;color: #f80;font-size: 16px">
+
+            退出登录
+        </blockquote>
+    </a>
+
+</div>
+
+<div th:replace="mobile/common/footer :: footer">
+</div>
+</body>
+
+<div th:replace="mobile/common/js :: js">
+</div>
+
+
+<script>
+    $("#body").css("min-height", ($(window).height() - 50) + "px")
+
+    //查询用户信息
+    $.ajax({
+        type: "get",
+        url: "/user/userInfo",
+        data: {},
+        dataType: "json",
+        success: function (data) {
+            if (data.code == 200) {
+                if (data.data.userPhoto) {
+                    $("#imgLogo").attr("src", data.data.userPhoto);
+                }
+                if (data.data.nickName) {
+                    $("#my_name").html(data.data.nickName);
+                } else {
+                    $("#my_name").html(data.data.username);
+                }
+
+                if (data.data.userSex === '0') {
+                    $("#boyIcon").css("display", "inline")
+                }
+
+                if (data.data.userSex === '1') {
+                    $("#girlIcon").css("display", "inline")
+                }
+
+                $("#accountBalance").html(data.data.accountBalance);
+
+            } else if (data.code == 1001) {
+                //未登录
+                location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+            } else {
+                layer.alert(data.msg);
+            }
+
+        },
+        error: function () {
+            layer.alert('网络异常');
+        }
+    })
+
+
+    function moreNewBooks(event) {
+        window.location.href = "/book/book_ranking.html?sortBy=last_index_update_time";
+    }
+
+    function searchBooks() {
+        var keywords = $("#title").val();
+        window.location.href = "/book/book_ranking.html?keyword=" + encodeURI(keywords);
+    }
+
+    function toMyCollect() {
+        var token = localStorage.getItem("token");
+        if (token) {
+            window.location.href = "/book/book_ranking.html?token=" + token;
+        } else {
+            window.location.href = "/user/login.html";
+        }
+    }
+
+</script>
+
+
+</body>
+</html>

templates/orange/static/mobile/js/common.js

@@ -1,3 +1,94 @@
+var needLoginPath = ['/user/favorites.html', '/user/comment.html', '/user/feedback.html',
+    '/user/feedback_list.html', '/user/read_history.html', '/user/set_name.html',
+    '/user/set_password.html', '/user/set_sex.html', '/user/setup.html', '/user/userinfo.html',
+    "/pay/index.html," +
+    "/author/register.html", "/author/index.html"];
+var isLogin = false;
+var url = window.location.search;
+
+//key(需要检索的键）
+function getSearchString(key) {
+    var str = url;
+    str = str.substring(1, str.length); // 获取URL中?之后的字符（去掉第一位的问号）
+    // 以&分隔字符串，获得类似name=xiaoli这样的元素数组
+    var arr = str.split("&");
+
+    for (var i = 0; i < arr.length; i++) {
+        var tmp_arr = arr[i].split("=");
+        if (tmp_arr[0] == key) {
+            return decodeURIComponent(tmp_arr[1]);
+        }
+    }
+    return undefined;
+}
+
+var keyword = getSearchString("k");
+if (keyword != undefined) {
+    $("#searchKey").val(keyword);
+    $("#workDirection").remove();
+    $("#idGirl").remove();
+}
+
+function searchByK(k) {
+    if (!k) {
+        window.location.href = '/book/bookclass.html?k=' + encodeURIComponent(document.getElementById("searchKey").value)
+    } else {
+        window.location.href = '/book/bookclass.html?k=' + encodeURIComponent(k)
+    }
+}
+
+$("#searchKey").keypress(function (even) {
+    if (even.which == 13) {
+        even.stopPropagation();
+        //enter键按下
+        searchByK();
+    }
+});
+Array.prototype.indexOf = function (val) {
+    for (var i = 0; i < this.length; i++) {
+        if (this[i] == val) return i;
+    }
+    return -1;
+};
+
+jQuery.cookie = function (name, value, options) {
+    if (typeof value != 'undefined') {
+        options = options || {};
+        if (value === null) {
+            value = '';
+            options.expires = -1;
+        }
+        var expires = '';
+        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+            var date;
+            if (typeof options.expires == 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString();
+        }
+        var path = options.path ? '; path=' + options.path : '';
+        var domain = options.domain ? '; domain=' + options.domain : '';
+        var secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    } else {
+        var cookieValue = null;
+        if (document.cookie && document.cookie != '') {
+            var cookies = document.cookie.split(';');
+            for (var i = 0; i < cookies.length; i++) {
+                var cookie = jQuery.trim(cookies[i]);
+                if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                    break;
+                }
+            }
+        }
+        return cookieValue;
+    }
+};
+
 Array.prototype.indexOf = function (val) {
     for (var i = 0; i < this.length; i++) {
         if (this[i] == val) return i;
@@ -12,13 +103,53 @@ Array.prototype.remove = function (val) {
     }
 };
 
-var token = localStorage.getItem("token");
-if (token) {
-    $.get("/user/isLogin", {"token": token}, function (data) {
-        if (data.code != 1) {//未登录
-            localStorage.removeItem("token");
+var token = $.cookie('Authorization');
+if (!token) {
+    if (needLoginPath.indexOf(window.location.pathname) != -1) {
+        location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+    }
+
+    $(".user_link").html("<a href=\"/user/login.html\">登录</a>｜<a href=\"/user/register.html\">注册</a>");
+} else {
+    $.ajax({
+        type: "POST",
+        url: "/user/refreshToken",
+        data: {},
+        dataType: "json",
+        success: function (data) {
+            if (data.code == 200) {
+                $(".user_link").html("<a href=\"/user/userinfo.html\"><i style=\"font-size: 20px;\" class=\"layui-icon \n" +
+                    "\">&#xe66f;" +
+                    "\n" +
+                    "</i></a>");
+                if ("/user/login.html" == window.location.pathname) {
+                    var orginUrl = getSearchString("originUrl");
+                    window.location.href = orginUrl == undefined || orginUrl.isBlank() ? "/" : orginUrl;
+                    return;
+                }
+                isLogin = true;
+                if (localStorage.getItem("autoLogin") == 1) {
+                    $.cookie('Authorization', data.data.token, {expires: 7, path: '/'});
+                } else {
+                    $.cookie('Authorization', data.data.token, {path: '/'});
+                }
+            } else {
+                if (needLoginPath.indexOf(window.location.pathname) != -1) {
+                    location.href = '/user/login.html';
+                }
+                $(".user_link").html("<a href=\"/user/login.html\">登录</a>｜<a href=\"/user/register.html\">注册</a>");
+            }
+        },
+        error: function () {
+            layer.alert('网络异常');
         }
-    })
+
+    });
+}
+
+function logout() {
+    $.cookie('Authorization', null, {path: '/'});
+    location.reload();
 }
 
 
@@ -45,5 +176,26 @@ function getQueryVariable(variable) {
     return (false);
 }
 
+String.prototype.isPhone = function () {
+    var strTemp = /^1[3|4|5|6|7|8|9][0-9]{9}$/;
+    if (strTemp.test(this)) {
+        return true;
+    }
+    return false;
+};
+
+String.prototype.isBlank = function () {
+    if (this == null || $.trim(this) == "") {
+        return true;
+    }
+    return false;
+};
+String.prototype.isNickName = function () {
+    var strTemp = /^[\u4E00-\u9FA5A-Za-z0-9_]+$/;
+    if (strTemp.test(this)) {
+        return true;
+    }
+    return false;
+};
 
 

templates/orange/static/mobile/layui/css/layui.css

@@ -1847,7 +1847,7 @@ a cite {
 }
 
 .layui-btn-primary:hover {
-    border-color: #009688;
+    border-color: #f80;
     color: #333
 }
 
@@ -2230,11 +2230,11 @@ a cite {
 }
 
 .layui-form-checked span, .layui-form-checked:hover span {
-    background-color: #5FB878
+    background-color: #f80
 }
 
 .layui-form-checked i, .layui-form-checked:hover i {
-    color: #5FB878
+    color: #f80
 }
 
 .layui-form-item .layui-form-checkbox {
@@ -2276,13 +2276,13 @@ a cite {
 }
 
 .layui-form-checkbox[lay-skin=primary]:hover i {
-    border-color: #5FB878;
+    border-color: #f80;
     color: #fff
 }
 
 .layui-form-checked[lay-skin=primary] i {
-    border-color: #5FB878;
-    background-color: #5FB878;
+    border-color: #f80;
+    background-color: #f80;
     color: #fff
 }