v3.6.0发布

Bump shiro-spring from 1.3.2 to 1.7.0 in /novel-admin

.gitignore

@@ -1,18 +1,7 @@
-/.idea
-/cachedata
-/logs
-/novel-common/target
-/novel-front/target
-/novel-front/*.iml
-/novel-common/*.iml
-/novel-mobile/target
-/novel-mobile/*.iml
-/novel-front/novel-front.iml
-/novel-crawl/novel-crawl.iml
-/novel-crawl/target
-/novel-admin/target
-/*.iml
-/novel-admin/*.iml
-.DS_Store
-/novel-admin/cachedata
-/novel-admin/logs
+**/logs
+**/.idea
+**/cachedata
+**/target
+**/*.iml
+**/.DS_Store
+

D:\gitee\admin-base\java2nb\src/main/java/com/java2nb/system/controller/UserController.java

@@ -1,135 +0,0 @@
-package com.java2nb.system.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.system.domain.UserDO;
-import com.java2nb.system.service.UserService;
-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 2020-12-01 03:46:33
- */
-
-@Controller
-@RequestMapping("/system/user")
-public class UserController {
-    @Autowired
-    private UserService userService;
-
-    @GetMapping()
-    @RequiresPermissions("system:user:user")
-    String User() {
-        return "system/user/user";
-    }
-
-    @ApiOperation(value = "获取列表", notes = "获取列表")
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("system:user:user")
-    public R list(@RequestParam Map<String, Object> params) {
-        //查询列表数据
-        Query query = new Query(params);
-        List<UserDO> userList = userService.list(query);
-        int total = userService.count(query);
-        PageBean pageBean = new PageBean(userList, total);
-        return R.ok().put("data", pageBean);
-    }
-
-    @ApiOperation(value = "新增页面", notes = "新增页面")
-    @GetMapping("/add")
-    @RequiresPermissions("system:user:add")
-    String add() {
-        return "system/user/add";
-    }
-
-    @ApiOperation(value = "修改页面", notes = "修改页面")
-    @GetMapping("/edit/{id}")
-    @RequiresPermissions("system:user:edit")
-    String edit(@PathVariable("id") Long id, Model model) {
-            UserDO user = userService.get(id);
-        model.addAttribute("user", user);
-        return "system/user/edit";
-    }
-
-    @ApiOperation(value = "查看页面", notes = "查看页面")
-    @GetMapping("/detail/{id}")
-    @RequiresPermissions("system:user:detail")
-    String detail(@PathVariable("id") Long id, Model model) {
-			UserDO user = userService.get(id);
-        model.addAttribute("user", user);
-        return "system/user/detail";
-    }
-
-    /**
-     * 保存
-     */
-    @ApiOperation(value = "新增", notes = "新增")
-    @ResponseBody
-    @PostMapping("/save")
-    @RequiresPermissions("system:user:add")
-    public R save( UserDO user) {
-        if (userService.save(user) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 修改
-     */
-    @ApiOperation(value = "修改", notes = "修改")
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("system:user:edit")
-    public R update( UserDO user) {
-            userService.update(user);
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @ApiOperation(value = "删除", notes = "删除")
-    @PostMapping("/remove")
-    @ResponseBody
-    @RequiresPermissions("system:user:remove")
-    public R remove( Long id) {
-        if (userService.remove(id) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @ApiOperation(value = "批量删除", notes = "批量删除")
-    @PostMapping("/batchRemove")
-    @ResponseBody
-    @RequiresPermissions("system:user:batchRemove")
-    public R remove(@RequestParam("ids[]") Long[] ids) {
-            userService.batchRemove(ids);
-        return R.ok();
-    }
-
-}

D:\gitee\admin-base\java2nb\src/main/java/com/java2nb/system/dao/UserDao.java

@@ -1,32 +0,0 @@
-package com.java2nb.system.dao;
-
-import com.java2nb.system.domain.UserDO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2020-12-01 03:46:33
- */
-@Mapper
-public interface UserDao {
-
-	UserDO get(Long id);
-	
-	List<UserDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(UserDO user);
-	
-	int update(UserDO user);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}

D:\gitee\admin-base\java2nb\src/main/java/com/java2nb/system/domain/UserDO.java

@@ -1,177 +0,0 @@
-package com.java2nb.system.domain;
-
-import java.io.Serializable;
-
-
-import java.math.BigDecimal;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.java2nb.common.jsonserializer.LongToStringSerializer;
-
-
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
-
-
-
-/**
- * 
- * 
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2020-12-01 03:46:33
- */
-public class UserDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	
-	//主键
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long id;
-	//登录名
-			private String username;
-	//登录密码
-			private String password;
-	//昵称
-			private String nickName;
-	//用户头像
-			private String userPhoto;
-	//用户性别，0：男，1：女
-			private Integer userSex;
-	//账户余额
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long accountBalance;
-	//用户状态，0：正常
-			private Integer status;
-	//创建时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date createTime;
-	//更新时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date updateTime;
-
-	/**
-	 * 设置：主键
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：主键
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：登录名
-	 */
-	public void setUsername(String username) {
-		this.username = username;
-	}
-	/**
-	 * 获取：登录名
-	 */
-	public String getUsername() {
-		return username;
-	}
-	/**
-	 * 设置：登录密码
-	 */
-	public void setPassword(String password) {
-		this.password = password;
-	}
-	/**
-	 * 获取：登录密码
-	 */
-	public String getPassword() {
-		return password;
-	}
-	/**
-	 * 设置：昵称
-	 */
-	public void setNickName(String nickName) {
-		this.nickName = nickName;
-	}
-	/**
-	 * 获取：昵称
-	 */
-	public String getNickName() {
-		return nickName;
-	}
-	/**
-	 * 设置：用户头像
-	 */
-	public void setUserPhoto(String userPhoto) {
-		this.userPhoto = userPhoto;
-	}
-	/**
-	 * 获取：用户头像
-	 */
-	public String getUserPhoto() {
-		return userPhoto;
-	}
-	/**
-	 * 设置：用户性别，0：男，1：女
-	 */
-	public void setUserSex(Integer userSex) {
-		this.userSex = userSex;
-	}
-	/**
-	 * 获取：用户性别，0：男，1：女
-	 */
-	public Integer getUserSex() {
-		return userSex;
-	}
-	/**
-	 * 设置：账户余额
-	 */
-	public void setAccountBalance(Long accountBalance) {
-		this.accountBalance = accountBalance;
-	}
-	/**
-	 * 获取：账户余额
-	 */
-	public Long getAccountBalance() {
-		return accountBalance;
-	}
-	/**
-	 * 设置：用户状态，0：正常
-	 */
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-	/**
-	 * 获取：用户状态，0：正常
-	 */
-	public Integer getStatus() {
-		return status;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-	/**
-	 * 设置：更新时间
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	/**
-	 * 获取：更新时间
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-}

D:\gitee\admin-base\java2nb\src/main/java/com/java2nb/system/service/UserService.java

@@ -1,30 +0,0 @@
-package com.java2nb.system.service;
-
-import com.java2nb.system.domain.UserDO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 
- * 
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2020-12-01 03:46:33
- */
-public interface UserService {
-	
-	UserDO get(Long id);
-	
-	List<UserDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(UserDO user);
-	
-	int update(UserDO user);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}

D:\gitee\admin-base\java2nb\src/main/java/com/java2nb/system/service/impl/UserServiceImpl.java

@@ -1,55 +0,0 @@
-package com.java2nb.system.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.java2nb.system.dao.UserDao;
-import com.java2nb.system.domain.UserDO;
-import com.java2nb.system.service.UserService;
-
-
-
-@Service
-public class UserServiceImpl implements UserService {
-	@Autowired
-	private UserDao userDao;
-	
-	@Override
-	public UserDO get(Long id){
-		return userDao.get(id);
-	}
-	
-	@Override
-	public List<UserDO> list(Map<String, Object> map){
-		return userDao.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return userDao.count(map);
-	}
-	
-	@Override
-	public int save(UserDO user){
-		return userDao.save(user);
-	}
-	
-	@Override
-	public int update(UserDO user){
-		return userDao.update(user);
-	}
-	
-	@Override
-	public int remove(Long id){
-		return userDao.remove(id);
-	}
-	
-	@Override
-	public int batchRemove(Long[] ids){
-		return userDao.batchRemove(ids);
-	}
-	
-}

D:\gitee\admin-base\java2nb\src/main/resources/mybatis/system/UserMapper.xml

@@ -1,138 +0,0 @@
-<?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.system.dao.UserDao">
-
-	<select id="get" resultType="com.java2nb.system.domain.UserDO">
-		select `id`,`username`,`password`,`nick_name`,`user_photo`,`user_sex`,`account_balance`,`status`,`create_time`,`update_time` from user where id = #{value}
-	</select>
-
-	<select id="list" resultType="com.java2nb.system.domain.UserDO">
-		select `id`,`username`,`password`,`nick_name`,`user_photo`,`user_sex`,`account_balance`,`status`,`create_time`,`update_time` from user
-        <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="username != null and username != ''"> and username = #{username} </if>
-		  		  <if test="password != null and password != ''"> and password = #{password} </if>
-		  		  <if test="nickName != null and nickName != ''"> and nick_name = #{nickName} </if>
-		  		  <if test="userPhoto != null and userPhoto != ''"> and user_photo = #{userPhoto} </if>
-		  		  <if test="userSex != null and userSex != ''"> and user_sex = #{userSex} </if>
-		  		  <if test="accountBalance != null and accountBalance != ''"> and account_balance = #{accountBalance} </if>
-		  		  <if test="status != null and status != ''"> and status = #{status} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </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
-		 <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="username != null and username != ''"> and username = #{username} </if>
-		  		  <if test="password != null and password != ''"> and password = #{password} </if>
-		  		  <if test="nickName != null and nickName != ''"> and nick_name = #{nickName} </if>
-		  		  <if test="userPhoto != null and userPhoto != ''"> and user_photo = #{userPhoto} </if>
-		  		  <if test="userSex != null and userSex != ''"> and user_sex = #{userSex} </if>
-		  		  <if test="accountBalance != null and accountBalance != ''"> and account_balance = #{accountBalance} </if>
-		  		  <if test="status != null and status != ''"> and status = #{status} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </if>
-		  		</where>
-	</select>
-	 
-	<insert id="save" parameterType="com.java2nb.system.domain.UserDO">
-		insert into user
-		(
-			`id`, 
-			`username`, 
-			`password`, 
-			`nick_name`, 
-			`user_photo`, 
-			`user_sex`, 
-			`account_balance`, 
-			`status`, 
-			`create_time`, 
-			`update_time`
-		)
-		values
-		(
-			#{id}, 
-			#{username}, 
-			#{password}, 
-			#{nickName}, 
-			#{userPhoto}, 
-			#{userSex}, 
-			#{accountBalance}, 
-			#{status}, 
-			#{createTime}, 
-			#{updateTime}
-		)
-	</insert>
-
-	<insert id="saveSelective" parameterType="com.java2nb.system.domain.UserDO">
-		insert into user
-		(
-					<if test="id != null"> `id`,  </if>
-					<if test="username != null"> `username`,  </if>
-					<if test="password != null"> `password`,  </if>
-					<if test="nickName != null"> `nick_name`,  </if>
-					<if test="userPhoto != null"> `user_photo`,  </if>
-					<if test="userSex != null"> `user_sex`,  </if>
-					<if test="accountBalance != null"> `account_balance`,  </if>
-					<if test="status != null"> `status`,  </if>
-					<if test="createTime != null"> `create_time`,  </if>
-					<if test="updateTime != null"> `update_time` </if>
-				)
-		values
-		(
-					<if test="id != null"> #{id},  </if>
-					<if test="username != null"> #{username},  </if>
-					<if test="password != null"> #{password},  </if>
-					<if test="nickName != null"> #{nickName},  </if>
-					<if test="userPhoto != null"> #{userPhoto},  </if>
-					<if test="userSex != null"> #{userSex},  </if>
-					<if test="accountBalance != null"> #{accountBalance},  </if>
-					<if test="status != null"> #{status},  </if>
-					<if test="createTime != null"> #{createTime},  </if>
-					<if test="updateTime != null"> #{updateTime} </if>
-				)
-	</insert>
-	 
-	<update id="update" parameterType="com.java2nb.system.domain.UserDO">
-		update user 
-		<set>
-			<if test="username != null">`username` = #{username}, </if>
-			<if test="password != null">`password` = #{password}, </if>
-			<if test="nickName != null">`nick_name` = #{nickName}, </if>
-			<if test="userPhoto != null">`user_photo` = #{userPhoto}, </if>
-			<if test="userSex != null">`user_sex` = #{userSex}, </if>
-			<if test="accountBalance != null">`account_balance` = #{accountBalance}, </if>
-			<if test="status != null">`status` = #{status}, </if>
-			<if test="createTime != null">`create_time` = #{createTime}, </if>
-			<if test="updateTime != null">`update_time` = #{updateTime}</if>
-		</set>
-		where id = #{id}
-	</update>
-	
-	<delete id="remove">
-		delete from user where id = #{value}
-	</delete>
-	
-	<delete id="batchRemove">
-		delete from user where id in 
-		<foreach item="id" collection="array" open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</delete>
-
-</mapper>

D:\gitee\admin-base\java2nb\src/main/resources/static/js/appjs/system/user/add.js

@@ -1,107 +0,0 @@
-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: "/system/user/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: {
-                                                                                                                                                                                                                    }
-})
-}

D:\gitee\admin-base\java2nb\src/main/resources/static/js/appjs/system/user/edit.js

@@ -1,103 +0,0 @@
-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: "/system/user/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: {
-                                                                                                                                                                                                                    }
-})
-}

D:\gitee\admin-base\java2nb\src/main/resources/static/js/appjs/system/user/user.js

@@ -1,231 +0,0 @@
-var prefix = "/system/user"
-$(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: [
-                    {
-                        checkbox: true
-                    },
-                    {
-                        title: '序号',
-                        formatter: function () {
-                            return arguments[2] + 1;
-                        }
-                    },
-                                                                        {
-                                field: 'id',
-                                title: '主键'
-                            },
-
-                        
-                                                                        {
-                                field: 'username',
-                                title: '登录名'
-                            },
-
-                        
-                                                                        {
-                                field: 'password',
-                                title: '登录密码'
-                            },
-
-                        
-                                                                        {
-                                field: 'nickName',
-                                title: '昵称'
-                            },
-
-                        
-                                                                        {
-                                field: 'userPhoto',
-                                title: '用户头像'
-                            },
-
-                        
-                                                                        {
-                                field: 'userSex',
-                                title: '用户性别，0：男，1：女'
-                            },
-
-                        
-                                                                        {
-                                field: 'accountBalance',
-                                title: '账户余额'
-                            },
-
-                        
-                                                                        {
-                                field: 'status',
-                                title: '用户状态，0：正常'
-                            },
-
-                        
-                                                                        {
-                                field: 'createTime',
-                                title: '创建时间'
-                            },
-
-                        
-                                                                        {
-                                field: 'updateTime',
-                                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> ';
-                            var r = '<a class="btn btn-warning btn-sm ' + s_remove_h + '" href="#" title="删除"  mce_href="#" onclick="remove(\''
-                                + row.id
-                                + '\')"><i class="fa fa-remove"></i></a> ';
-                            return d + e + r;
-                        }
-                    }]
-            });
-}
-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 () {
-
-    });
-}

D:\gitee\admin-base\java2nb\src/main/resources/static/sql/system/user/menu.js

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

D:\gitee\admin-base\java2nb\src/main/resources/templates/system/user/add.html

@@ -1,113 +0,0 @@
-<!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">登录名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="username" name="username"
-                                                   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="password" name="password"
-                                                   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="nickName" name="nickName"
-                                                   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="userPhoto" name="userPhoto"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">用户性别，0：男，1：女：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="userSex" name="userSex"
-                                                   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="accountBalance" name="accountBalance"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">用户状态，0：正常：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="status" name="status"
-                                                   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">
-                                                                            <label class="col-sm-3 control-label">更新时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="updateTime"
-                                                   name="updateTime"
-                                                   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/system/user/add.js">
-</script>
-</body>
-</html>

D:\gitee\admin-base\java2nb\src/main/resources/templates/system/user/detail.html

@@ -1,110 +0,0 @@
-<!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="${user.id}"
-                       type="hidden">
-                                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">登录名：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${user.username}">
-                            </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="${user.password}">
-                            </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="${user.nickName}">
-                            </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="${user.userPhoto}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">用户性别，0：男，1：女：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${user.userSex}">
-                            </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="${user.accountBalance}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">用户状态，0：正常：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${user.status}">
-                            </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="${user.createTime}==null?null:${#dates.format(user.createTime,'yyyy-MM-dd HH:mm:ss')}">
-                            </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="${user.updateTime}==null?null:${#dates.format(user.updateTime,'yyyy-MM-dd HH:mm:ss')}">
-                            </div>
-                        
-
-                    </div>
-                                                    </form>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-<div th:include="include::footer"></div>
-</body>
-</html>

D:\gitee\admin-base\java2nb\src/main/resources/templates/system/user/edit.html

@@ -1,115 +0,0 @@
-<!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="${user.id}"
-                               type="hidden">
-                                                                                                                                        <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">登录名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="username" name="username"
-                                                   th:value="${user.username}"
-                                                   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="password" name="password"
-                                                   th:value="${user.password}"
-                                                   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="nickName" name="nickName"
-                                                   th:value="${user.nickName}"
-                                                   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="userPhoto" name="userPhoto"
-                                                   th:value="${user.userPhoto}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">用户性别，0：男，1：女：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="userSex" name="userSex"
-                                                   th:value="${user.userSex}"
-                                                   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="accountBalance" name="accountBalance"
-                                                   th:value="${user.accountBalance}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">用户状态，0：正常：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="status" name="status"
-                                                   th:value="${user.status}"
-                                                   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="${user.createTime}==null?null:${#dates.format(user.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">
-                                                                            <label class="col-sm-3 control-label">更新时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="updateTime"
-                                                   name="updateTime"
-                                                   th:value="${user.updateTime}==null?null:${#dates.format(user.updateTime,'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/system/user/edit.js">
-</script>
-</body>
-</html>

D:\gitee\admin-base\java2nb\src/main/resources/templates/system/user/user.html

@@ -1,66 +0,0 @@
-<!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-left">
-                        <button shiro:hasPermission="system:user:add" type="button"
-                                class="btn  btn-primary" onclick="add()">
-                            <i class="fa fa-plus" aria-hidden="true"></i>添加
-                        </button>
-                        <button shiro:hasPermission="system:user:batchRemove" type="button"
-                                class="btn  btn-danger"
-                                onclick="batchRemove()">
-                            <i class="fa fa-trash" aria-hidden="true"></i>删除
-                        </button>
-                    </div>
-                    <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">
-                            <input id="id" name="id" type="text" class="form-control"
-                                   placeholder="主键">
-                        </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="system:user:edit">
-    <script type="text/javascript">
-        s_edit_h = '';
-    </script>
-</div>
-<div shiro:hasPermission="system:user:remove">
-    <script type="text/javascript">
-        var s_remove_h = '';
-    </script>
-</div>
-<div th:include="include :: footer"></div>
-<script type="text/javascript" src="/js/appjs/system/user/user.js"></script>
-</body>
-</html>

README.md

@@ -2,26 +2,31 @@
 
 # 小说精品屋-plus
 
+[![Github stars](https://img.shields.io/github/stars/201206030/novel-plus?logo=github)](https://github.com/201206030/novel-plus)
+[![Github forks](https://img.shields.io/github/forks/201206030/novel-plus?logo=github)](https://github.com/201206030/novel-plus)
+[![Gitee star](https://gitee.com/novel_dev_team/novel-plus/badge/star.svg?theme=gitee)](https://gitee.com/novel_dev_team/novel-plus)
+[![Gitee fork](https://gitee.com/novel_dev_team/novel-plus/badge/fork.svg?theme=gitee)](https://gitee.com/novel_dev_team/novel-plus)
+
+#### 官网
+
+https://201206030.github.io
+
 #### 新项目：小说精品屋-微服务版
 
 基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台。
 
-Gitee仓库地址： https://gitee.com/xiongxyang/novel-cloud
-
 GitHub仓库地址： https://github.com/201206030/novel-cloud
 
+Gitee仓库地址： https://gitee.com/novel_dev_team/novel-cloud
+
 #### 演示地址
 
 [点击前往](http://47.106.243.172:8888/)
 
 
-#### 前言
-
-小说精品屋-plus致力于打造一个完整的商用小说门户平台，使用前建议先阅读此文档。
-
 #### 项目介绍
 
-小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、移动）阅读、功能完善的小说原创/爬虫网站项目，既包含了作家专区供原创作者上传小说，又提供了爬虫工具通过规则多线程全自动采集任意小说网站数据（已兼容99%的小说网站），新书自动入库，老书自动更新。
+小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、WAP）阅读、功能完善的原创文学CMS系统，由前台门户系统、作家后台管理系统、平台后台管理系统、爬虫管理系统等多个子系统构成，支持会员充值、订阅模式、新闻发布和实时统计报表等功能。
 
 小说精品屋-plus重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
 
@@ -29,6 +34,8 @@ GitHub仓库地址： https://github.com/201206030/novel-cloud
 - [x] 服务端代码重构，MyBatis3升级为MyBatis3DynamicSql。
 - [x] 移动站与PC站站点分离，浏览器自动识别跳转。
 - [x] PC站UI更新。
+- [x] 支持前端模版自定义，内置多套模版。
+- [x] 可拓展的多种方式存储小说内容，内置数据库（分表）存储和TXT文本存储。
 - [x] 新闻模块。
 - [x] 排行榜。
 - [x] 小说评论模块。
@@ -44,9 +51,10 @@ GitHub仓库地址： https://github.com/201206030/novel-cloud
 ```
 novel-plus -- 父工程
 ├── novel-common -- 通用模块
-├── novel-front -- 前台门户系统
-├── novel-crawl -- 爬虫管理系统
-└── novel-admin -- 后台管理系统
+├── novel-front -- 前台门户&作家后台管理子系统（可拆分）
+├── novel-crawl -- 爬虫管理子系统
+├── novel-admin -- 平台后台管理子系统
+└── templates -- 前端模版
 ```
 
 #### 技术选型
@@ -76,11 +84,22 @@ novel-plus -- 父工程
 | Layui                | 前端UI                    
                  
 
-#### PC站截图
+#### 开发工具
+感谢Jetbrains公司提供的免费License。
+
+[![index]( https://s3.ax1x.com/2021/01/14/sdHsJg.png )]( https://www.jetbrains.com/?from=小说精品屋)
+
+
+#### 接口文档
+
+[点击查看接口文档示例](doc/api/api.md)
+
+#### 橙色主题模版截图
+##### PC站截图
 
 1. 首页
 
-![img](https://oscimg.oschina.net/oscnet/up-bbb1c7f72e183327bff754a9fa8bb75223e.png)
+![img](https://s3.ax1x.com/2020/12/27/r5400A.png)
 
 2. 分类索引页
 
@@ -88,7 +107,7 @@ novel-plus -- 父工程
 
 3. 搜索页
 
-![img](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ20200520-215756.png)
+![img](https://s3.ax1x.com/2020/12/27/r5TO8x.png)
 
 ![img](https://oscimg.oschina.net/oscnet/up-ed5f689557718924acac76bc3ebca36afcb.png)
 
@@ -130,31 +149,31 @@ novel-plus -- 父工程
 
 ![img](https://oscimg.oschina.net/oscnet/up-f849960f4c1303fea77d26e64fc505a7180.png)
 
-#### 手机站截图
+##### 手机站截图
 
 1. 首页
 
-   <img src="https://s3.ax1x.com/2020/12/04/DbsSoj.jpg" alt="index" style="zoom:33%;" />
+   <img src="https://s3.ax1x.com/2020/12/27/r5447n.jpg" alt="index" width="300" />
 
 2. 小说列表页
 
-   <img src="https://s3.ax1x.com/2020/12/04/DbrfsO.jpg" alt="微信图片_20190904181558" style="zoom: 33%;" />
+   <img src="https://s3.ax1x.com/2020/12/27/r55xKg.jpg" alt="微信图片_20190904181558" width="300" />
 
 3. 小说详情页
 
-   <img src="https://s3.ax1x.com/2020/12/04/DbsklV.jpg" alt="QQ图片20191018161901" style="zoom:33%;" />
+   <img src="https://s3.ax1x.com/2020/12/28/roZWOf.jpg" alt="QQ图片20191018161901" width="300" />
 
 4. 小说阅读页
 
-   <img src="https://s3.ax1x.com/2020/12/04/Dbsew4.jpg" alt="QQ图片20191018161901" style="zoom:33%;" />
+   <img src="https://s3.ax1x.com/2020/12/27/r55Stx.jpg" alt="QQ图片20191018161901" width="300" />
 
-#### 爬虫管理系统截图
+##### 爬虫管理系统截图
 
 ![img](https://s1.ax1x.com/2020/11/03/BsOgbD.png)
 
 ![img](https://s1.ax1x.com/2020/11/03/BsOHr8.png)
 
-#### 后台管理系统截图
+##### 后台管理系统截图
 
 ![img](https://oscimg.oschina.net/oscnet/up-0552343538674a22a64819834100558f39b.png)
 
@@ -164,30 +183,97 @@ novel-plus -- 父工程
 
 ![img](https://oscimg.oschina.net/oscnet/up-faf5dda7320674c29a1772bc0c81d74762e.png)
 
-#### 安装步骤
+#### 深色主题模版截图
+##### PC站截图
+
+1. 首页
+
+   ![index](https://static.oschina.net/uploads/img/202006/24151811_wIus.png)
+
+##### 手机站截图
+1. 首页
+
+   ![index](https://static.oschina.net/uploads/img/202006/24151812_OOob.jpg)
+
+4. 小说详情页
+
+   ![微信图片_20190904181558](https://static.oschina.net/uploads/img/202006/24151812_ZosF.png)
+
+5. 目录页
+
+   ![QQ图片20191018161901](https://static.oschina.net/uploads/img/202006/24151812_Krva.png)
+
+5. 小说阅读页
+
+   ![QQ图片20191018161901](https://static.oschina.net/uploads/img/202006/24151813_fDgT.png)
+
+#### 蓝色主题模版截图（更新中）
+
+   ![QQ图片20191018161901](https://s3.ax1x.com/2020/12/27/r5Fe0A.png)
+
+#### 安装步骤（源码，小白请看其他安装教程）
 
 ##### 数据库安装：
 
 1. 安装MySQL软件。
 2. 修改MySQL`max_allowed_packet `配置（建议100M）。
 3. 新建数据库，设置编码为utf8mb4。
-4. 执行sql/novel_plus.sql脚本文件。
+4. 执行doc/sql/novel_plus.sql脚本文件。
 
 ##### 爬虫管理系统安装：
 
-1.  修改novel-common模块下application-dev.yml文件中的数据库的配置。
+1. 修改novel-common模块下application-common-dev.yml（dev环境，默认环境）或application-common-prod.yml（prod环境，需要在application.yml配置文件中切换）配置文件中的数据库配置。
 2. 修改novel-crawl模块下application.yml文件中的管理员账号密码。
 3. 启动程序，打开浏览器，默认8081端口访问。
 4. 选择已有或新增爬虫源（支持自定义爬虫规则），点击`开启`按钮，开始爬取小说数据。
 
-##### 前台小说门户安装：
+##### 前台小说门户安装（dev环境跳过3、4步骤）：
 
-1. 修改novel-common模块下application-dev.yml文件中的数据库的配置。
-2. 启动程序，打开浏览器，默认8080端口访问。
+1. 修改novel-common模块下application-common-dev.yml（dev环境，默认环境）或application-common-prod.yml（prod环境，需要在application.yml配置文件中切换）配置文件中的数据库配置。
+
+2. 修改novel-front模块下application-website配置文件中的网站信息。
+
+  ```
+  #网站配置
+  website:
+    #网站名
+    name: 小说精品屋
+    #域名
+    domain: xiongxyang.gitee.io
+    #SEO关键词
+    keyword: ${website.name},小说,小说CMS,原创文学系统,开源小说系统,免费小说建站程序
+    #SEO描述
+    description: ${website.name}是一个多端（PC、WAP）阅读、功能完善的原创文学CMS系统，由前台门户系统、作家后台管理系统、平台后台管理系统、爬虫管理系统等多个子系统构成，支持会员充值、订阅模式、新闻发布和实时统计报表等功能，新书自动入库，老书自动更新。
+    #联系QQ
+    qq: 1179705413
+  ```
+
+3. prod环境下需要修改novel-front模块下application-prod.yml配置文件中的模版名为你需要使用的模版名（templates文件夹下的模版文件夹名，内置orange和dark两套模版，prod环境下才支持多模版）。
+
+  ```
+  #模版配置
+  templates:
+    #模版名
+    name: orange
+  ```
+
+4. prod环境下的jar包形式部署时，需要复制templates文件夹到jar文件的相同目录下。   
+
+5. 启动程序，打开浏览器，默认8080端口访问。
 
 **喜欢此项目的可以给我的GitHub和Gitee加个Star支持一下 。**
 
-#### 其他安装教程
+#### 其他安装教程（如果链接打不开，可关注公众号获取）
+
+##### version>=3.5.0版本
+
+包安装及低版本升级教程：[点击前往](https://my.oschina.net/java2nb/blog/4914688)
+
+##### 3.3.0<=version<3.5.0版本
+
+包安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4842472) 
+
+##### version<3.3.0版本
 
 包安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4272630) 
 
@@ -197,15 +283,23 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
 
 #### 代码仓库
 
- Gitee仓库地址： https://gitee.com/xiongxyang/novel-plus
-
  GitHub仓库地址： https://github.com/201206030/novel-plus 
 
+ Gitee仓库地址： https://gitee.com/novel_dev_team/novel-plus
+
 #### QQ交流群
 
-![mini-code](https://s1.ax1x.com/2020/10/31/BUQVeI.png)
+[点击前往官网查看](https://xiongxyang.gitee.io/service.htm)
 
-#### 微信公众号（发布最新更新资讯）
+问问题的三要素
+
+1. 说明背景，使用了哪个模块，要做什么？
+
+2. 怎么输入或操作的得到了什么结果？ 截图，日志
+
+3. 哪里不明白或有什么疑问 ？
+
+#### 微信公众号（发布最新更新资讯、最新前端模版、最新爬虫规则、技术文档等）
 
 ![mini-code](https://s3.ax1x.com/2020/12/03/DoImOx.png)
 
@@ -219,7 +313,7 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
 
 ![mini-code](https://s1.ax1x.com/2020/10/31/BUQJwq.png)
 
-### 免责声明
+#### 免责声明
 
 本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。
 用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。

doc/api/api.md

@@ -0,0 +1,116 @@
+
+ <h1 class="curproject-name"> 小说精品屋-plus </h1> 
+ 小说精品屋-plus接口
+
+
+# 作家模块
+
+## 小说章节分页列表查询接口
+<a id=小说章节分页列表查询接口> </a>
+### 基本信息
+
+**Path：** /book/queryIndexList
+
+**Method：** GET
+
+**接口描述：**
+<p>作家后台章节管理页面需要请求该接口获取小说章节分页列表信息</p>
+
+
+### 请求参数
+**Query**
+
+| 参数名称  |  是否必须 | 示例  | 备注  |
+| ------------ | ------------ | ------------ | ------------ |
+| bookId | 是  |  1334337530296893441 |  小说ID |
+| curr | 否  |  1 |  查询页码，默认1 |
+| limit | 否  |  5 |  分页大小，默认5 |
+
+### 返回数据
+
+<table>
+  <thead class="ant-table-thead">
+    <tr>
+      <th key=name>名称</th><th key=type>类型</th><th key=required>是否必须</th><th key=default>默认值</th><th key=desc>备注</th><th key=sub>其他信息</th>
+    </tr>
+  </thead><tbody className="ant-table-tbody"><tr key=0-0><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> code</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应状态吗，200表示成功</span></td><td key=5></td></tr><tr key=0-1><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> msg</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应信息</span></td><td key=5></td></tr><tr key=0-2><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> data</span></td><td key=1><span>object</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应数据</span></td><td key=5></td></tr><tr key=0-2-0><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> total</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">总数量</span></td><td key=5></td></tr><tr key=0-2-1><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> list</span></td><td key=1><span>object []</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">章节数据集合</span></td><td key=5><p key=3><span style="font-weight: '700'">item 类型: </span><span>object</span></p></td></tr><tr key=0-2-1-0><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> id</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">章节ID</span></td><td key=5></td></tr><tr key=0-2-1-1><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> bookId</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">小说ID</span></td><td key=5></td></tr><tr key=0-2-1-2><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> indexName</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">章节名</span></td><td key=5></td></tr><tr key=0-2-1-3><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> isVip</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">是否收费，1:收费，0:免费</span></td><td key=5></td></tr><tr key=0-2-1-4><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> updateTime</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">更新时间</span></td><td key=5></td></tr><tr key=0-2-2><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> pageNum</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">页码</span></td><td key=5></td></tr><tr key=0-2-3><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> pageSize</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">分页大小</span></td><td key=5></td></tr><tr key=0-2-4><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> size</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">当前页数量</span></td><td key=5></td></tr>
+               </tbody>
+              </table>
+            
+## 小说章节删除接口
+<a id=小说章节删除接口> </a>
+### 基本信息
+
+**Path：** /author/deleteIndex/{indexId}
+
+**Method：** DELETE
+
+**接口描述：**
+<p>作家后台章节管理页面点击删除按钮请求该接口删除小说章节内容</p>
+
+
+### 请求参数
+**Headers**
+
+| 参数名称  | 参数值  |  是否必须 | 示例  | 备注  |
+| ------------ | ------------ | ------------ | ------------ | ------------ |
+| Content-Type  |  application/x-www-form-urlencoded | 是  |   |   |
+| Authorization  |   | 是  |  eyJhbGciOiJIUzUxMiJ9.eyJleHAiOjE2MDgzNDg0NzksInN1YiI6IntcImlkXCI6MTI1NTA2MDMyODMyMjAyNzUyMCxcInVzZXJuYW1lXCI6XCIxMzU2MDQyMTMyNFwiLFwibmlja05hbWVcIjpcIjEzNTYwNDIxMzI0XCJ9IiwiY3JlYXRlZCI6MTYwNzc0MzY3OTkxM30.0qhwis_zPb6t8wGNejMhDZ2iHCL9Tgh2UHd1gcQBCp8t6RW3ggSwtfo4l_RgMT_v8jOkLW91GzTVWlNnTE6LCA |  认证JWT，请求登录接口成功后返回 |
+**路径参数**
+
+| 参数名称 | 示例  | 备注  |
+| ------------ | ------------ | ------------ |
+| indexId |  1337603246936645632 |  章节ID |
+
+### 返回数据
+
+<table>
+  <thead class="ant-table-thead">
+    <tr>
+      <th key=name>名称</th><th key=type>类型</th><th key=required>是否必须</th><th key=default>默认值</th><th key=desc>备注</th><th key=sub>其他信息</th>
+    </tr>
+  </thead><tbody className="ant-table-tbody"><tr key=0-0><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> code</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应状态吗，200表示成功</span></td><td key=5></td></tr><tr key=0-1><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> msg</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应信息</span></td><td key=5></td></tr>
+               </tbody>
+              </table>
+            
+## 小说章节发布接口
+<a id=小说章节发布接口> </a>
+### 基本信息
+
+**Path：** /author/addBookContent
+
+**Method：** POST
+
+**接口描述：**
+<p>作家后台章节发布页面点击提交按钮请求该接口新增小说章节内容</p>
+
+
+### 请求参数
+**Headers**
+
+| 参数名称  | 参数值  |  是否必须 | 示例  | 备注  |
+| ------------ | ------------ | ------------ | ------------ | ------------ |
+| Content-Type  |  application/x-www-form-urlencoded | 是  |   |   |
+| Authorization  |   | 是  |  eyJhbGciOiJIUzUxMiJ9.eyJleHAiOjE2MDgzNDg0NzksInN1YiI6IntcImlkXCI6MTI1NTA2MDMyODMyMjAyNzUyMCxcInVzZXJuYW1lXCI6XCIxMzU2MDQyMTMyNFwiLFwibmlja05hbWVcIjpcIjEzNTYwNDIxMzI0XCJ9IiwiY3JlYXRlZCI6MTYwNzc0MzY3OTkxM30.0qhwis_zPb6t8wGNejMhDZ2iHCL9Tgh2UHd1gcQBCp8t6RW3ggSwtfo4l_RgMT_v8jOkLW91GzTVWlNnTE6LCA |  认证JWT，请求登录接口成功后返回 |
+**Body**
+
+| 参数名称  | 参数类型  |  是否必须 | 示例  | 备注  |
+| ------------ | ------------ | ------------ | ------------ | ------------ |
+| bookId | text  |  是 |  1334337530296893441  |  小说ID |
+| indexName | text  |  是 |  第六章未婚妻（下）  |  章节名 |
+| content | text  |  是 |  开始之时，李七夜还是生疏无比，那怕他对于刀术的所有奥义了然于胸，但是，他出刀之时依然会颤抖，无法达到妙及巅毫的要求。  |  章节内容 |
+| isVip | text  |  是 |  1  |  是否收费，1:收费，0:免费 |
+
+
+
+### 返回数据
+
+<table>
+  <thead class="ant-table-thead">
+    <tr>
+      <th key=name>名称</th><th key=type>类型</th><th key=required>是否必须</th><th key=default>默认值</th><th key=desc>备注</th><th key=sub>其他信息</th>
+    </tr>
+  </thead><tbody className="ant-table-tbody"><tr key=0-0><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> code</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应状态吗，200表示成功</span></td><td key=5></td></tr><tr key=0-1><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> msg</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应信息</span></td><td key=5></td></tr>
+               </tbody>
+              </table>
+            

doc/sql/20210726.sql

@@ -0,0 +1 @@
+alter table news add column `read_count` BIGINT NOT NULL DEFAULT '0' COMMENT '阅读量' after content;

doc/sql/novel_plus.sql

@@ -491,13 +491,6 @@ CREATE TABLE `sys_dept` (
 -- ----------------------------
 -- Records of sys_dept
 -- ----------------------------
-INSERT INTO `sys_dept` VALUES ('6', '0', '研发部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('7', '6', '研發一部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('8', '6', '研发二部', '2', '1');
-INSERT INTO `sys_dept` VALUES ('9', '0', '销售部', '2', '1');
-INSERT INTO `sys_dept` VALUES ('10', '9', '销售一部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('11', '0', '产品部', '3', '1');
-INSERT INTO `sys_dept` VALUES ('12', '11', '产品一部', '1', '1');
 INSERT INTO `sys_dept` VALUES ('13', '0', '测试部', '5', '1');
 INSERT INTO `sys_dept` VALUES ('14', '13', '测试一部', '1', '1');
 INSERT INTO `sys_dept` VALUES ('15', '13', '测试二部', '2', '1');
@@ -894,52 +887,6 @@ CREATE TABLE `sys_log` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1412 DEFAULT CHARSET=utf8 COMMENT='系统日志';
 
--- ----------------------------
--- Records of sys_log
--- ----------------------------
-INSERT INTO `sys_log` VALUES ('1369', '-1', '获取用户信息为空', '登录', '462', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:21');
-INSERT INTO `sys_log` VALUES ('1370', '-1', '获取用户信息为空', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:26');
-INSERT INTO `sys_log` VALUES ('1371', '1', 'admin', '登录', '98', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:33');
-INSERT INTO `sys_log` VALUES ('1372', '1', 'admin', '请求访问主页', '372', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:09:33');
-INSERT INTO `sys_log` VALUES ('1373', '1', 'admin', '请求访问主页', '28', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:12:41');
-INSERT INTO `sys_log` VALUES ('1374', '1', 'admin', '编辑角色', '11', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:18:42');
-INSERT INTO `sys_log` VALUES ('1375', '1', 'admin', '添加菜单', '2', 'com.java2nb.system.controller.MenuController.add()', null, '127.0.0.1', '2020-05-13 11:19:55');
-INSERT INTO `sys_log` VALUES ('1376', '1', 'admin', '保存菜单', '225', 'com.java2nb.system.controller.MenuController.save()', null, '127.0.0.1', '2020-05-13 11:24:42');
-INSERT INTO `sys_log` VALUES ('1377', '1', 'admin', '编辑菜单', '15', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:54');
-INSERT INTO `sys_log` VALUES ('1378', '1', 'admin', '编辑菜单', '11', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:58');
-INSERT INTO `sys_log` VALUES ('1379', '1', 'admin', '更新菜单', '241', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:12');
-INSERT INTO `sys_log` VALUES ('1380', '1', 'admin', '编辑菜单', '8', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:25:16');
-INSERT INTO `sys_log` VALUES ('1381', '1', 'admin', '更新菜单', '199', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:26');
-INSERT INTO `sys_log` VALUES ('1382', '1', 'admin', '编辑角色', '13', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:26:11');
-INSERT INTO `sys_log` VALUES ('1383', '1', 'admin', '更新角色', '931', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:26:36');
-INSERT INTO `sys_log` VALUES ('1384', '-1', '获取用户信息为空', '登录', '11', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:02');
-INSERT INTO `sys_log` VALUES ('1385', '1', 'admin', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:08');
-INSERT INTO `sys_log` VALUES ('1386', '1', 'admin', '请求访问主页', '27', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:08');
-INSERT INTO `sys_log` VALUES ('1387', '1', 'admin', '登录', '272', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:56');
-INSERT INTO `sys_log` VALUES ('1388', '1', 'admin', '请求访问主页', '109', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:56');
-INSERT INTO `sys_log` VALUES ('1389', '1', 'admin', '编辑角色', '8', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:30:36');
-INSERT INTO `sys_log` VALUES ('1390', '1', 'admin', '更新角色', '567', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:30:42');
-INSERT INTO `sys_log` VALUES ('1391', '-1', '获取用户信息为空', '登录', '246', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:38');
-INSERT INTO `sys_log` VALUES ('1392', '1', 'admin', '登录', '38', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:42');
-INSERT INTO `sys_log` VALUES ('1393', '1', 'admin', '请求访问主页', '110', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:31:43');
-INSERT INTO `sys_log` VALUES ('1394', '1', 'admin', 'error', null, 'http://127.0.0.1/test/order/list', 'org.springframework.jdbc.BadSqlGrammarException: \r\n### Error querying database.  Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\r\n### The error may exist in file [E:\\baseprojectparent\\novel-plus\\novel-admin\\target\\classes\\mybatis\\test\\OrderMapper.xml]\r\n### The error may involve defaultParameterMap\r\n### The error occurred while setting parameters\r\n### SQL: select `id`,`fb_merchant_code`,`merchant_order_sn`,`order_sn`,`platform_order_no`,`trade_no`,`order_state`,`fn_coupon`,`red_packet`,`total_fee`,`order_price`,`fee`,`body`,`attach`,`store_id`,`cashier_id`,`device_no`,`user_id`,`user_logon_id`,`pay_time`,`pay_channel`,`no_cash_coupon_fee`,`cash_coupon_fee`,`cash_fee`,`sign`,`options`,`create_time`,`push_time`,`push_ip`,`mcht_id`,`sn` from fb_order                                      order by id desc             limit ?, ?\r\n### Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist', null, '2020-05-13 11:33:27');
-INSERT INTO `sys_log` VALUES ('1395', '1', 'admin', '登录', '276', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:39:20');
-INSERT INTO `sys_log` VALUES ('1396', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:39:20');
-INSERT INTO `sys_log` VALUES ('1397', '1', 'admin', '登录', '285', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:47:00');
-INSERT INTO `sys_log` VALUES ('1398', '1', 'admin', '请求访问主页', '90', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:47:00');
-INSERT INTO `sys_log` VALUES ('1399', '1', 'admin', '登录', '251', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:48:28');
-INSERT INTO `sys_log` VALUES ('1400', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:48:28');
-INSERT INTO `sys_log` VALUES ('1401', '1', 'admin', '登录', '302', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:09:33');
-INSERT INTO `sys_log` VALUES ('1402', '1', 'admin', '请求访问主页', '88', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:09:34');
-INSERT INTO `sys_log` VALUES ('1403', '1', 'admin', '请求更改用户密码', '3', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:11:49');
-INSERT INTO `sys_log` VALUES ('1404', '1', 'admin', 'admin提交更改用户密码', '140', 'com.java2nb.system.controller.UserController.adminResetPwd()', null, '127.0.0.1', '2020-05-13 14:11:50');
-INSERT INTO `sys_log` VALUES ('1405', '1', 'admin', '请求更改用户密码', '4', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:12:11');
-INSERT INTO `sys_log` VALUES ('1406', '1', 'admin', '登录', '275', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:14:26');
-INSERT INTO `sys_log` VALUES ('1407', '1', 'admin', '请求访问主页', '73', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:14:27');
-INSERT INTO `sys_log` VALUES ('1408', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:38');
-INSERT INTO `sys_log` VALUES ('1409', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:47');
-INSERT INTO `sys_log` VALUES ('1410', '1', 'admin', '登录', '261', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:18:07');
-INSERT INTO `sys_log` VALUES ('1411', '1', 'admin', '请求访问主页', '83', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:18:07');
 
 -- ----------------------------
 -- Table structure for sys_menu
@@ -1047,9 +994,6 @@ CREATE TABLE `sys_role` (
 -- Records of sys_role
 -- ----------------------------
 INSERT INTO `sys_role` VALUES ('1', '超级用户角色', 'admin', '拥有最高权限', '2', '2017-08-12 00:43:52', '2017-08-12 19:14:59');
-INSERT INTO `sys_role` VALUES ('59', '普通用户', null, '基本用户权限', null, null, null);
-INSERT INTO `sys_role` VALUES ('60', '测试', null, '<div>', null, null, null);
-INSERT INTO `sys_role` VALUES ('61', 'test', null, '测试', null, null, null);
 
 -- ----------------------------
 -- Table structure for sys_role_data_perm
@@ -1497,19 +1441,7 @@ CREATE TABLE `sys_user` (
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES ('1', 'admin', '超级管理员', 'd633268afedf209e1e4ea0f5f43228a8', '6', 'admin@example.com', '17699999999', '1', '1', '2017-08-15 21:40:39', '2017-08-15 21:41:00', '96', '2017-12-14 00:00:00', '148', 'ccc', '122;121;', '北京市', '北京市市辖区', '东城区');
-INSERT INTO `sys_user` VALUES ('2', 'test', '临时用户', 'd0af8fa1272ef5a152d9e27763eea293', '6', 'test@bootdo.com', null, '1', '1', '2017-08-14 13:43:05', '2017-08-14 21:15:36', null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('36', 'ldh', '刘德华', 'bfd9394475754fbe45866eba97738c36', '7', 'ldh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('123', 'zxy', '张学友', '35174ba93f5fe7267f1fb3c1bf903781', '6', 'zxy@bootdo', null, '0', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('124', 'wyf', '吴亦凡', 'e179e6f687bbd57b9d7efc4746c8090a', '6', 'wyf@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('130', 'lh', '鹿晗', '7924710cd673f68967cde70e188bb097', '9', 'lh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('131', 'lhc', '令狐冲', 'd515538e17ecb570ba40344b5618f5d4', '6', 'lhc@bootdo.com', null, '0', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('132', 'lyf', '刘亦菲', '7fdb1d9008f45950c1620ba0864e5fbd', '13', 'lyf@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('134', 'lyh', '李彦宏', 'dc26092b3244d9d432863f2738180e19', '8', 'lyh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('135', 'wjl', '王健林', '3967697dfced162cf6a34080259b83aa', '6', 'wjl@bootod.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('136', 'gdg', '郭德纲', '3bb1bda86bc02bf6478cd91e42135d2f', '9', 'gdg@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('137', 'test2', 'test2', '649169898e69272c0e5bc899baf1e904', null, '1179705413@qq.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('138', 'test3', 'test3', '79ba2d0b58d8a2e94f6b18744c8cd280', '16', '1179705413@qq.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO `sys_user` VALUES ('1', 'admin', '超级管理员', 'd633268afedf209e1e4ea0f5f43228a8', '14', 'admin@example.com', '17699999999', '1', '1', '2017-08-15 21:40:39', '2017-08-15 21:41:00', '96', '2017-12-14 00:00:00', '148', 'ccc', '122;121;', '北京市', '北京市市辖区', '东城区');
 
 -- ----------------------------
 -- Table structure for sys_user_role
@@ -1904,4 +1836,8 @@ INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4900, 1, 235);
 INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4888, 1, 234);
 
 
-delete from sys_menu where menu_id = 202;
+delete from sys_menu where menu_id = 202;
+
+INSERT INTO crawl_source(`id`, `source_name`, `crawl_rule`, `source_status`, `create_time`, `update_time`) VALUES (16, 'i笔趣阁', '{\"bookListUrl\":\"http://m.ibiquge.net/xclass/{catId}/{page}.html\",\"catIdRule\":{\"catId1\":\"1\",\"catId2\":\"2\",\"catId3\":\"3\",\"catId4\":\"4\",\"catId5\":\"6\",\"catId6\":\"5\",\"catId7\":\"7\"},\"bookIdPatten\":\"href=\\\"/(\\\\d+_\\\\d+)/\\\"\",\"pagePatten\":\"value=\\\"(\\\\d+)/\\\\d+\\\"\",\"totalPagePatten\":\"value=\\\"\\\\d+/(\\\\d+)\\\"\",\"bookDetailUrl\":\"http://m.ibiquge.net/{bookId}/\",\"bookNamePatten\":\"<span class=\\\"title\\\">([^/]+)</span>\",\"authorNamePatten\":\"<a href=\\\"/author/\\\\d+/\\\">([^/]+)</a>\",\"picUrlPatten\":\"<img src=\\\"([^>]+)\\\"\\\\s+onerror=\\\"this.src=\",\"picUrlPrefix\":\"http://m.ibiquge.net\",\"statusPatten\":\">状态：([^/]+)</li>\",\"bookStatusRule\":{\"连载\":0,\"完结\":1},\"visitCountPatten\":\">点击：(\\\\d+)</li>\",\"descStart\":\"<p class=\\\"review\\\">\",\"descEnd\":\"</p>\",\"bookIndexUrl\":\"http://www.ibiquge.net/{bookId}/\",\"bookIndexStart\":\"正文</dt>\",\"indexIdPatten\":\"<a\\\\s+style=\\\"\\\"\\\\s+href=\\\"/\\\\d+_\\\\d+/(\\\\d+)\\\\.html\\\">[^/]+</a>\",\"indexNamePatten\":\"<a\\\\s+style=\\\"\\\"\\\\s+href=\\\"/\\\\d+_\\\\d+/\\\\d+\\\\.html\\\">([^/]+)</a>\",\"bookContentUrl\":\"http://www.ibiquge.net/{bookId}/{indexId}.html\",\"contentStart\":\"</p>\",\"contentEnd\":\"<div align=\\\"center\\\">\"}', 0, '2021-02-04 21:31:23', '2021-02-04 21:31:23');
+
+alter table news add column `read_count` BIGINT NOT NULL DEFAULT '0' COMMENT '阅读量' after content;

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>2.11.0</version>
+    <version>3.6.0</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>

novel-admin/src/main/java/com/java2nb/AdminApplication.java

@@ -2,20 +2,18 @@ package com.java2nb;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-//关闭SpringSecurity的功能
-@EnableAutoConfiguration(exclude = {
-        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
-})
+
 @EnableTransactionManagement
 @ServletComponentScan
 @MapperScan("com.java2nb.*.dao")
-@SpringBootApplication
+@SpringBootApplication(exclude = {
+        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+})
 @EnableCaching
 public class AdminApplication {
     public static void main(String[] args) {

novel-admin/src/main/java/com/java2nb/common/config/ShiroConfig.java

@@ -75,7 +75,6 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/img/**", "anon");
         filterChainDefinitionMap.put("/docs/**", "anon");
         filterChainDefinitionMap.put("/layuimini/**", "anon");
-        filterChainDefinitionMap.put("/druid/**", "anon");
         filterChainDefinitionMap.put("/upload/**", "anon");
         filterChainDefinitionMap.put("/files/**", "anon");
         filterChainDefinitionMap.put("/logout", "logout");

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

@@ -1,19 +1,17 @@
 package com.java2nb.novel.controller;
 
 import com.java2nb.common.utils.DateUtils;
-import com.java2nb.common.utils.PageBean;
-import com.java2nb.common.utils.Query;
 import com.java2nb.common.utils.R;
-import com.java2nb.novel.domain.AuthorCodeDO;
-import com.java2nb.novel.service.*;
-import com.java2nb.test.service.OrderService;
-import io.swagger.annotations.ApiOperation;
+import com.java2nb.novel.service.AuthorService;
+import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.PayService;
+import com.java2nb.novel.service.UserService;
 import lombok.SneakyThrows;
-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.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

novel-admin/src/main/java/com/java2nb/test/controller/OrderController.java

@@ -1,135 +0,0 @@
-package com.java2nb.test.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.test.domain.OrderDO;
-import com.java2nb.test.service.OrderService;
-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 2019-11-25 11:57:16
- */
-
-@Controller
-@RequestMapping("/test/order")
-public class OrderController {
-    @Autowired
-    private OrderService orderService;
-
-    @GetMapping()
-    @RequiresPermissions("test:order:order")
-    String Order() {
-        return "test/order/order";
-    }
-
-    @ApiOperation(value = "获取付呗-订单信息表列表", notes = "获取付呗-订单信息表列表")
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("test:order:order")
-    public R list(@RequestParam Map<String, Object> params) {
-        //查询列表数据
-        Query query = new Query(params);
-        List<OrderDO> orderList = orderService.list(query);
-        int total = orderService.count(query);
-        PageBean pageBean = new PageBean(orderList, total);
-        return R.ok().put("data", pageBean);
-    }
-
-    @ApiOperation(value = "新增付呗-订单信息表页面", notes = "新增付呗-订单信息表页面")
-    @GetMapping("/add")
-    @RequiresPermissions("test:order:add")
-    String add() {
-        return "test/order/add";
-    }
-
-    @ApiOperation(value = "修改付呗-订单信息表页面", notes = "修改付呗-订单信息表页面")
-    @GetMapping("/edit/{id}")
-    @RequiresPermissions("test:order:edit")
-    String edit(@PathVariable("id") Long id, Model model) {
-            OrderDO order = orderService.get(id);
-        model.addAttribute("order", order);
-        return "test/order/edit";
-    }
-
-    @ApiOperation(value = "查看付呗-订单信息表页面", notes = "查看付呗-订单信息表页面")
-    @GetMapping("/detail/{id}")
-    @RequiresPermissions("test:order:detail")
-    String detail(@PathVariable("id") Long id, Model model) {
-			OrderDO order = orderService.get(id);
-        model.addAttribute("order", order);
-        return "test/order/detail";
-    }
-
-    /**
-     * 保存
-     */
-    @ApiOperation(value = "新增付呗-订单信息表", notes = "新增付呗-订单信息表")
-    @ResponseBody
-    @PostMapping("/save")
-    @RequiresPermissions("test:order:add")
-    public R save( OrderDO order) {
-        if (orderService.save(order) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 修改
-     */
-    @ApiOperation(value = "修改付呗-订单信息表", notes = "修改付呗-订单信息表")
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("test:order:edit")
-    public R update( OrderDO order) {
-            orderService.update(order);
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @ApiOperation(value = "删除付呗-订单信息表", notes = "删除付呗-订单信息表")
-    @PostMapping("/remove")
-    @ResponseBody
-    @RequiresPermissions("test:order:remove")
-    public R remove( Long id) {
-        if (orderService.remove(id) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @ApiOperation(value = "批量删除付呗-订单信息表", notes = "批量删除付呗-订单信息表")
-    @PostMapping("/batchRemove")
-    @ResponseBody
-    @RequiresPermissions("test:order:batchRemove")
-    public R remove(@RequestParam("ids[]") Long[] ids) {
-            orderService.batchRemove(ids);
-        return R.ok();
-    }
-
-}

novel-admin/src/main/java/com/java2nb/test/dao/OrderDao.java

@@ -1,32 +0,0 @@
-package com.java2nb.test.dao;
-
-import com.java2nb.test.domain.OrderDO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 付呗-订单信息表
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2019-11-25 11:57:16
- */
-@Mapper
-public interface OrderDao {
-
-	OrderDO get(Long id);
-	
-	List<OrderDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(OrderDO order);
-	
-	int update(OrderDO order);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}

novel-admin/src/main/java/com/java2nb/test/domain/OrderDO.java

@@ -1,475 +0,0 @@
-package com.java2nb.test.domain;
-
-import java.io.Serializable;
-
-
-import java.math.BigDecimal;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.java2nb.common.jsonserializer.LongToStringSerializer;
-
-
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
-
-
-
-/**
- * 付呗-订单信息表
- * 
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2019-11-25 11:57:16
- */
-public class OrderDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	
-	//主键
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long id;
-	//付呗商户号
-			private String fbMerchantCode;
-	//第三方商户的订单号
-			private String merchantOrderSn;
-	//付呗订单号
-			private String orderSn;
-	//平台方订单号
-			private String platformOrderNo;
-	//商户单号
-			private String tradeNo;
-	//订单状态，1：未支付，2：支付成功，3：支付失败，4：支付取消
-			private Integer orderState;
-	//蜂鸟优惠卷抵扣
-			private Double fnCoupon;
-	//红包抵扣
-			private BigDecimal redPacket;
-	//实收金额(元)
-			private BigDecimal totalFee;
-	//订单金额
-			private BigDecimal orderPrice;
-	//手续费(元)
-			private BigDecimal fee;
-	//对商品或交易的描述
-			private String body;
-	//附加数据
-			private String attach;
-	//付呗系统的门店id
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long storeId;
-	//付呗系统的收银员id
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long cashierId;
-	//设备终端号
-			private String deviceNo;
-	//微信顾客支付授权的“open_id”或者支付宝顾客的“buyer_user_id”
-			private String userId;
-	//支付宝顾客的账号
-			private String userLogonId;
-	//交易成功的时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date payTime;
-	//支付通道:1微信、2支付宝、3银联
-			private Integer payChannel;
-	//免充值代金券金额(元)
-			private BigDecimal noCashCouponFee;
-	//预充值代金券金额(元)
-			private BigDecimal cashCouponFee;
-	//顾客实际支付金额(元)
-			private BigDecimal cashFee;
-	//签名
-			private String sign;
-	//其它选项
-			private String options;
-	//创建时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date createTime;
-	//推送时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date pushTime;
-	//推送IP
-			private String pushIp;
-	//商户id
-			private BigDecimal mchtId;
-	//QR编号
-			private String sn;
-
-	/**
-	 * 设置：主键
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：主键
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：付呗商户号
-	 */
-	public void setFbMerchantCode(String fbMerchantCode) {
-		this.fbMerchantCode = fbMerchantCode;
-	}
-	/**
-	 * 获取：付呗商户号
-	 */
-	public String getFbMerchantCode() {
-		return fbMerchantCode;
-	}
-	/**
-	 * 设置：第三方商户的订单号
-	 */
-	public void setMerchantOrderSn(String merchantOrderSn) {
-		this.merchantOrderSn = merchantOrderSn;
-	}
-	/**
-	 * 获取：第三方商户的订单号
-	 */
-	public String getMerchantOrderSn() {
-		return merchantOrderSn;
-	}
-	/**
-	 * 设置：付呗订单号
-	 */
-	public void setOrderSn(String orderSn) {
-		this.orderSn = orderSn;
-	}
-	/**
-	 * 获取：付呗订单号
-	 */
-	public String getOrderSn() {
-		return orderSn;
-	}
-	/**
-	 * 设置：平台方订单号
-	 */
-	public void setPlatformOrderNo(String platformOrderNo) {
-		this.platformOrderNo = platformOrderNo;
-	}
-	/**
-	 * 获取：平台方订单号
-	 */
-	public String getPlatformOrderNo() {
-		return platformOrderNo;
-	}
-	/**
-	 * 设置：商户单号
-	 */
-	public void setTradeNo(String tradeNo) {
-		this.tradeNo = tradeNo;
-	}
-	/**
-	 * 获取：商户单号
-	 */
-	public String getTradeNo() {
-		return tradeNo;
-	}
-	/**
-	 * 设置：订单状态，1：未支付，2：支付成功，3：支付失败，4：支付取消
-	 */
-	public void setOrderState(Integer orderState) {
-		this.orderState = orderState;
-	}
-	/**
-	 * 获取：订单状态，1：未支付，2：支付成功，3：支付失败，4：支付取消
-	 */
-	public Integer getOrderState() {
-		return orderState;
-	}
-	/**
-	 * 设置：蜂鸟优惠卷抵扣
-	 */
-	public void setFnCoupon(Double fnCoupon) {
-		this.fnCoupon = fnCoupon;
-	}
-	/**
-	 * 获取：蜂鸟优惠卷抵扣
-	 */
-	public Double getFnCoupon() {
-		return fnCoupon;
-	}
-	/**
-	 * 设置：红包抵扣
-	 */
-	public void setRedPacket(BigDecimal redPacket) {
-		this.redPacket = redPacket;
-	}
-	/**
-	 * 获取：红包抵扣
-	 */
-	public BigDecimal getRedPacket() {
-		return redPacket;
-	}
-	/**
-	 * 设置：实收金额(元)
-	 */
-	public void setTotalFee(BigDecimal totalFee) {
-		this.totalFee = totalFee;
-	}
-	/**
-	 * 获取：实收金额(元)
-	 */
-	public BigDecimal getTotalFee() {
-		return totalFee;
-	}
-	/**
-	 * 设置：订单金额
-	 */
-	public void setOrderPrice(BigDecimal orderPrice) {
-		this.orderPrice = orderPrice;
-	}
-	/**
-	 * 获取：订单金额
-	 */
-	public BigDecimal getOrderPrice() {
-		return orderPrice;
-	}
-	/**
-	 * 设置：手续费(元)
-	 */
-	public void setFee(BigDecimal fee) {
-		this.fee = fee;
-	}
-	/**
-	 * 获取：手续费(元)
-	 */
-	public BigDecimal getFee() {
-		return fee;
-	}
-	/**
-	 * 设置：对商品或交易的描述
-	 */
-	public void setBody(String body) {
-		this.body = body;
-	}
-	/**
-	 * 获取：对商品或交易的描述
-	 */
-	public String getBody() {
-		return body;
-	}
-	/**
-	 * 设置：附加数据
-	 */
-	public void setAttach(String attach) {
-		this.attach = attach;
-	}
-	/**
-	 * 获取：附加数据
-	 */
-	public String getAttach() {
-		return attach;
-	}
-	/**
-	 * 设置：付呗系统的门店id
-	 */
-	public void setStoreId(Long storeId) {
-		this.storeId = storeId;
-	}
-	/**
-	 * 获取：付呗系统的门店id
-	 */
-	public Long getStoreId() {
-		return storeId;
-	}
-	/**
-	 * 设置：付呗系统的收银员id
-	 */
-	public void setCashierId(Long cashierId) {
-		this.cashierId = cashierId;
-	}
-	/**
-	 * 获取：付呗系统的收银员id
-	 */
-	public Long getCashierId() {
-		return cashierId;
-	}
-	/**
-	 * 设置：设备终端号
-	 */
-	public void setDeviceNo(String deviceNo) {
-		this.deviceNo = deviceNo;
-	}
-	/**
-	 * 获取：设备终端号
-	 */
-	public String getDeviceNo() {
-		return deviceNo;
-	}
-	/**
-	 * 设置：微信顾客支付授权的“open_id”或者支付宝顾客的“buyer_user_id”
-	 */
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-	/**
-	 * 获取：微信顾客支付授权的“open_id”或者支付宝顾客的“buyer_user_id”
-	 */
-	public String getUserId() {
-		return userId;
-	}
-	/**
-	 * 设置：支付宝顾客的账号
-	 */
-	public void setUserLogonId(String userLogonId) {
-		this.userLogonId = userLogonId;
-	}
-	/**
-	 * 获取：支付宝顾客的账号
-	 */
-	public String getUserLogonId() {
-		return userLogonId;
-	}
-	/**
-	 * 设置：交易成功的时间
-	 */
-	public void setPayTime(Date payTime) {
-		this.payTime = payTime;
-	}
-	/**
-	 * 获取：交易成功的时间
-	 */
-	public Date getPayTime() {
-		return payTime;
-	}
-	/**
-	 * 设置：支付通道:1微信、2支付宝、3银联
-	 */
-	public void setPayChannel(Integer payChannel) {
-		this.payChannel = payChannel;
-	}
-	/**
-	 * 获取：支付通道:1微信、2支付宝、3银联
-	 */
-	public Integer getPayChannel() {
-		return payChannel;
-	}
-	/**
-	 * 设置：免充值代金券金额(元)
-	 */
-	public void setNoCashCouponFee(BigDecimal noCashCouponFee) {
-		this.noCashCouponFee = noCashCouponFee;
-	}
-	/**
-	 * 获取：免充值代金券金额(元)
-	 */
-	public BigDecimal getNoCashCouponFee() {
-		return noCashCouponFee;
-	}
-	/**
-	 * 设置：预充值代金券金额(元)
-	 */
-	public void setCashCouponFee(BigDecimal cashCouponFee) {
-		this.cashCouponFee = cashCouponFee;
-	}
-	/**
-	 * 获取：预充值代金券金额(元)
-	 */
-	public BigDecimal getCashCouponFee() {
-		return cashCouponFee;
-	}
-	/**
-	 * 设置：顾客实际支付金额(元)
-	 */
-	public void setCashFee(BigDecimal cashFee) {
-		this.cashFee = cashFee;
-	}
-	/**
-	 * 获取：顾客实际支付金额(元)
-	 */
-	public BigDecimal getCashFee() {
-		return cashFee;
-	}
-	/**
-	 * 设置：签名
-	 */
-	public void setSign(String sign) {
-		this.sign = sign;
-	}
-	/**
-	 * 获取：签名
-	 */
-	public String getSign() {
-		return sign;
-	}
-	/**
-	 * 设置：其它选项
-	 */
-	public void setOptions(String options) {
-		this.options = options;
-	}
-	/**
-	 * 获取：其它选项
-	 */
-	public String getOptions() {
-		return options;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-	/**
-	 * 设置：推送时间
-	 */
-	public void setPushTime(Date pushTime) {
-		this.pushTime = pushTime;
-	}
-	/**
-	 * 获取：推送时间
-	 */
-	public Date getPushTime() {
-		return pushTime;
-	}
-	/**
-	 * 设置：推送IP
-	 */
-	public void setPushIp(String pushIp) {
-		this.pushIp = pushIp;
-	}
-	/**
-	 * 获取：推送IP
-	 */
-	public String getPushIp() {
-		return pushIp;
-	}
-	/**
-	 * 设置：商户id
-	 */
-	public void setMchtId(BigDecimal mchtId) {
-		this.mchtId = mchtId;
-	}
-	/**
-	 * 获取：商户id
-	 */
-	public BigDecimal getMchtId() {
-		return mchtId;
-	}
-	/**
-	 * 设置：QR编号
-	 */
-	public void setSn(String sn) {
-		this.sn = sn;
-	}
-	/**
-	 * 获取：QR编号
-	 */
-	public String getSn() {
-		return sn;
-	}
-}

novel-admin/src/main/java/com/java2nb/test/service/OrderService.java

@@ -1,30 +0,0 @@
-package com.java2nb.test.service;
-
-import com.java2nb.test.domain.OrderDO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 付呗-订单信息表
- * 
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2019-11-25 11:57:16
- */
-public interface OrderService {
-	
-	OrderDO get(Long id);
-	
-	List<OrderDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(OrderDO order);
-	
-	int update(OrderDO order);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}

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

@@ -1,55 +0,0 @@
-package com.java2nb.test.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.java2nb.test.dao.OrderDao;
-import com.java2nb.test.domain.OrderDO;
-import com.java2nb.test.service.OrderService;
-
-
-
-@Service
-public class OrderServiceImpl implements OrderService {
-	@Autowired
-	private OrderDao orderDao;
-	
-	@Override
-	public OrderDO get(Long id){
-		return orderDao.get(id);
-	}
-	
-	@Override
-	public List<OrderDO> list(Map<String, Object> map){
-		return orderDao.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return orderDao.count(map);
-	}
-	
-	@Override
-	public int save(OrderDO order){
-		return orderDao.save(order);
-	}
-	
-	@Override
-	public int update(OrderDO order){
-		return orderDao.update(order);
-	}
-	
-	@Override
-	public int remove(Long id){
-		return orderDao.remove(id);
-	}
-	
-	@Override
-	public int batchRemove(Long[] ids){
-		return orderDao.batchRemove(ids);
-	}
-	
-}

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

@@ -1,5 +1,5 @@
 java2nb:
-  uploadPath: c:/var/java2nb/uploaded_files/
+  uploadPath: /var/pic/
   username: admin
   password: 111111
 logging:
@@ -9,8 +9,8 @@ logging:
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
     username: root
     password: test123456
     #password:

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

@@ -1,16 +1,19 @@
 java2nb:
-  uploadPath: /var/java2nb/uploaded_files/
+  uploadPath: /var/pic/
+  username: admin
+  password: 111111
 logging:
   level:
     root: error
-    com.java2nb: info
+    com.java2nb: error
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/java2nb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: java2nb
-    password: java2nb1019
+    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    username: root
+    password: test123456
+    #password:
     initialSize: 1
     minIdle: 3
     maxActive: 20
@@ -34,18 +37,18 @@ spring:
     # 合并多个DruidDataSource的监控数据
     #useGlobalDataSourceStat: true
   redis:
-      host: 127.0.0.1
-      port: 6379
-      password:
-      # 连接超时时间（毫秒）
-      timeout: 10000
-      jedis:
-        pool:
-          # 连接池中的最大空闲连接
-          max-idle: 8
-          # 连接池中的最小空闲连接
-          min-idle: 10
-          # 连接池最大连接数（使用负值表示没有限制）
-          max-active: 100
-          # 连接池最大阻塞等待时间（使用负值表示没有限制）
-          max-wait: -1
+    host: 127.0.0.1
+    port: 6379
+    password: test
+    # 连接超时时间（毫秒）
+    timeout: 10000
+    jedis:
+      pool:
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池中的最小空闲连接
+        min-idle: 10
+        # 连接池最大连接数（使用负值表示没有限制）
+        max-active: 100
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1

novel-admin/src/main/resources/banner.txt

@@ -1,6 +1,15 @@
-     __                     ________       ___.
-    |__|____ ___  _______   \_____  \  ____\_ |__
-    |  \__  \\  \/ /\__  \   /  ____/ /    \| __ \
-    |  |/ __ \\   /  / __ \_/       \|   |  \ \_\ \
-/\__|  (____  /\_/  (____  /\_______ \___|  /___  /
-\______|    \/           \/         \/    \/    \/
+${AnsiColor.CYAN}
+
+--------------------------------------------------------------------------------
+${AnsiColor.RED}
+||   / |  / /
+||  /  | / /  ___     //  ___      ___      _   __
+|| / /||/ / //___) ) // //   ) ) //   ) ) // ) )  ) )
+||/ / |  / //       // //       //   / / // / /  / /
+|  /  | / ((____   // ((____   ((___/ / // / /  / /   小说精品屋欢迎您！！！
+
+                                               -------Powered By XXY
+${AnsiColor.CYAN}
+--------------------------------------------------------------------------------
+${AnsiColor.BRIGHT_YELLOW}
+::: Spring-Boot ${spring-boot.formatted-version} :::

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

@@ -138,7 +138,7 @@
 	DATE_FORMAT( create_time, "%Y-%m-%d" ) AS staDate,
 	COUNT( 1 ) authorCount
 	FROM
-	AUTHOR
+	author
 	WHERE
 	create_time >= #{minDate}
 	GROUP BY

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

@@ -294,7 +294,7 @@
 	DATE_FORMAT( create_time, "%Y-%m-%d" ) AS staDate,
 	COUNT( 1 ) bookCount
     FROM
-    BOOK
+    book
     WHERE
         create_time >= #{minDate}
     GROUP BY

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

@@ -142,7 +142,7 @@
 	DATE_FORMAT( create_time, "%Y-%m-%d" ) AS staDate,
 	COUNT( 1 ) userCount
     FROM
-    USER
+    user
     WHERE
         create_time >= #{minDate}
     GROUP BY

novel-admin/src/main/resources/mybatis/test/OrderMapper.xml

@@ -1,283 +0,0 @@
-<?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.test.dao.OrderDao">
-
-	<select id="get" resultType="com.java2nb.test.domain.OrderDO">
-		select `id`,`fb_merchant_code`,`merchant_order_sn`,`order_sn`,`platform_order_no`,`trade_no`,`order_state`,`fn_coupon`,`red_packet`,`total_fee`,`order_price`,`fee`,`body`,`attach`,`store_id`,`cashier_id`,`device_no`,`user_id`,`user_logon_id`,`pay_time`,`pay_channel`,`no_cash_coupon_fee`,`cash_coupon_fee`,`cash_fee`,`sign`,`options`,`create_time`,`push_time`,`push_ip`,`mcht_id`,`sn` from fb_order where id = #{value}
-	</select>
-
-	<select id="list" resultType="com.java2nb.test.domain.OrderDO">
-		select `id`,`fb_merchant_code`,`merchant_order_sn`,`order_sn`,`platform_order_no`,`trade_no`,`order_state`,`fn_coupon`,`red_packet`,`total_fee`,`order_price`,`fee`,`body`,`attach`,`store_id`,`cashier_id`,`device_no`,`user_id`,`user_logon_id`,`pay_time`,`pay_channel`,`no_cash_coupon_fee`,`cash_coupon_fee`,`cash_fee`,`sign`,`options`,`create_time`,`push_time`,`push_ip`,`mcht_id`,`sn` from fb_order
-        <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="fbMerchantCode != null and fbMerchantCode != ''"> and fb_merchant_code = #{fbMerchantCode} </if>
-		  		  <if test="merchantOrderSn != null and merchantOrderSn != ''"> and merchant_order_sn = #{merchantOrderSn} </if>
-		  		  <if test="orderSn != null and orderSn != ''"> and order_sn = #{orderSn} </if>
-		  		  <if test="platformOrderNo != null and platformOrderNo != ''"> and platform_order_no = #{platformOrderNo} </if>
-		  		  <if test="tradeNo != null and tradeNo != ''"> and trade_no = #{tradeNo} </if>
-		  		  <if test="orderState != null and orderState != ''"> and order_state = #{orderState} </if>
-		  		  <if test="fnCoupon != null and fnCoupon != ''"> and fn_coupon = #{fnCoupon} </if>
-		  		  <if test="redPacket != null and redPacket != ''"> and red_packet = #{redPacket} </if>
-		  		  <if test="totalFee != null and totalFee != ''"> and total_fee = #{totalFee} </if>
-		  		  <if test="orderPrice != null and orderPrice != ''"> and order_price = #{orderPrice} </if>
-		  		  <if test="fee != null and fee != ''"> and fee = #{fee} </if>
-		  		  <if test="body != null and body != ''"> and body = #{body} </if>
-		  		  <if test="attach != null and attach != ''"> and attach = #{attach} </if>
-		  		  <if test="storeId != null and storeId != ''"> and store_id = #{storeId} </if>
-		  		  <if test="cashierId != null and cashierId != ''"> and cashier_id = #{cashierId} </if>
-		  		  <if test="deviceNo != null and deviceNo != ''"> and device_no = #{deviceNo} </if>
-		  		  <if test="userId != null and userId != ''"> and user_id = #{userId} </if>
-		  		  <if test="userLogonId != null and userLogonId != ''"> and user_logon_id = #{userLogonId} </if>
-		  		  <if test="payTime != null and payTime != ''"> and pay_time = #{payTime} </if>
-		  		  <if test="payChannel != null and payChannel != ''"> and pay_channel = #{payChannel} </if>
-		  		  <if test="noCashCouponFee != null and noCashCouponFee != ''"> and no_cash_coupon_fee = #{noCashCouponFee} </if>
-		  		  <if test="cashCouponFee != null and cashCouponFee != ''"> and cash_coupon_fee = #{cashCouponFee} </if>
-		  		  <if test="cashFee != null and cashFee != ''"> and cash_fee = #{cashFee} </if>
-		  		  <if test="sign != null and sign != ''"> and sign = #{sign} </if>
-		  		  <if test="options != null and options != ''"> and options = #{options} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="pushTime != null and pushTime != ''"> and push_time = #{pushTime} </if>
-		  		  <if test="pushIp != null and pushIp != ''"> and push_ip = #{pushIp} </if>
-		  		  <if test="mchtId != null and mchtId != ''"> and mcht_id = #{mchtId} </if>
-		  		  <if test="sn != null and sn != ''"> and sn = #{sn} </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 fb_order
-		 <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="fbMerchantCode != null and fbMerchantCode != ''"> and fb_merchant_code = #{fbMerchantCode} </if>
-		  		  <if test="merchantOrderSn != null and merchantOrderSn != ''"> and merchant_order_sn = #{merchantOrderSn} </if>
-		  		  <if test="orderSn != null and orderSn != ''"> and order_sn = #{orderSn} </if>
-		  		  <if test="platformOrderNo != null and platformOrderNo != ''"> and platform_order_no = #{platformOrderNo} </if>
-		  		  <if test="tradeNo != null and tradeNo != ''"> and trade_no = #{tradeNo} </if>
-		  		  <if test="orderState != null and orderState != ''"> and order_state = #{orderState} </if>
-		  		  <if test="fnCoupon != null and fnCoupon != ''"> and fn_coupon = #{fnCoupon} </if>
-		  		  <if test="redPacket != null and redPacket != ''"> and red_packet = #{redPacket} </if>
-		  		  <if test="totalFee != null and totalFee != ''"> and total_fee = #{totalFee} </if>
-		  		  <if test="orderPrice != null and orderPrice != ''"> and order_price = #{orderPrice} </if>
-		  		  <if test="fee != null and fee != ''"> and fee = #{fee} </if>
-		  		  <if test="body != null and body != ''"> and body = #{body} </if>
-		  		  <if test="attach != null and attach != ''"> and attach = #{attach} </if>
-		  		  <if test="storeId != null and storeId != ''"> and store_id = #{storeId} </if>
-		  		  <if test="cashierId != null and cashierId != ''"> and cashier_id = #{cashierId} </if>
-		  		  <if test="deviceNo != null and deviceNo != ''"> and device_no = #{deviceNo} </if>
-		  		  <if test="userId != null and userId != ''"> and user_id = #{userId} </if>
-		  		  <if test="userLogonId != null and userLogonId != ''"> and user_logon_id = #{userLogonId} </if>
-		  		  <if test="payTime != null and payTime != ''"> and pay_time = #{payTime} </if>
-		  		  <if test="payChannel != null and payChannel != ''"> and pay_channel = #{payChannel} </if>
-		  		  <if test="noCashCouponFee != null and noCashCouponFee != ''"> and no_cash_coupon_fee = #{noCashCouponFee} </if>
-		  		  <if test="cashCouponFee != null and cashCouponFee != ''"> and cash_coupon_fee = #{cashCouponFee} </if>
-		  		  <if test="cashFee != null and cashFee != ''"> and cash_fee = #{cashFee} </if>
-		  		  <if test="sign != null and sign != ''"> and sign = #{sign} </if>
-		  		  <if test="options != null and options != ''"> and options = #{options} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="pushTime != null and pushTime != ''"> and push_time = #{pushTime} </if>
-		  		  <if test="pushIp != null and pushIp != ''"> and push_ip = #{pushIp} </if>
-		  		  <if test="mchtId != null and mchtId != ''"> and mcht_id = #{mchtId} </if>
-		  		  <if test="sn != null and sn != ''"> and sn = #{sn} </if>
-		  		</where>
-	</select>
-	 
-	<insert id="save" parameterType="com.java2nb.test.domain.OrderDO" useGeneratedKeys="true" keyProperty="id">
-		insert into fb_order
-		(
-			`fb_merchant_code`, 
-			`merchant_order_sn`, 
-			`order_sn`, 
-			`platform_order_no`, 
-			`trade_no`, 
-			`order_state`, 
-			`fn_coupon`, 
-			`red_packet`, 
-			`total_fee`, 
-			`order_price`, 
-			`fee`, 
-			`body`, 
-			`attach`, 
-			`store_id`, 
-			`cashier_id`, 
-			`device_no`, 
-			`user_id`, 
-			`user_logon_id`, 
-			`pay_time`, 
-			`pay_channel`, 
-			`no_cash_coupon_fee`, 
-			`cash_coupon_fee`, 
-			`cash_fee`, 
-			`sign`, 
-			`options`, 
-			`create_time`, 
-			`push_time`, 
-			`push_ip`, 
-			`mcht_id`, 
-			`sn`
-		)
-		values
-		(
-			#{fbMerchantCode}, 
-			#{merchantOrderSn}, 
-			#{orderSn}, 
-			#{platformOrderNo}, 
-			#{tradeNo}, 
-			#{orderState}, 
-			#{fnCoupon}, 
-			#{redPacket}, 
-			#{totalFee}, 
-			#{orderPrice}, 
-			#{fee}, 
-			#{body}, 
-			#{attach}, 
-			#{storeId}, 
-			#{cashierId}, 
-			#{deviceNo}, 
-			#{userId}, 
-			#{userLogonId}, 
-			#{payTime}, 
-			#{payChannel}, 
-			#{noCashCouponFee}, 
-			#{cashCouponFee}, 
-			#{cashFee}, 
-			#{sign}, 
-			#{options}, 
-			#{createTime}, 
-			#{pushTime}, 
-			#{pushIp}, 
-			#{mchtId}, 
-			#{sn}
-		)
-	</insert>
-
-	<insert id="saveSelective" parameterType="com.java2nb.test.domain.OrderDO" useGeneratedKeys="true" keyProperty="id">
-		insert into fb_order
-		(
-					<if test="id != null"> `id`,  </if>
-					<if test="fbMerchantCode != null"> `fb_merchant_code`,  </if>
-					<if test="merchantOrderSn != null"> `merchant_order_sn`,  </if>
-					<if test="orderSn != null"> `order_sn`,  </if>
-					<if test="platformOrderNo != null"> `platform_order_no`,  </if>
-					<if test="tradeNo != null"> `trade_no`,  </if>
-					<if test="orderState != null"> `order_state`,  </if>
-					<if test="fnCoupon != null"> `fn_coupon`,  </if>
-					<if test="redPacket != null"> `red_packet`,  </if>
-					<if test="totalFee != null"> `total_fee`,  </if>
-					<if test="orderPrice != null"> `order_price`,  </if>
-					<if test="fee != null"> `fee`,  </if>
-					<if test="body != null"> `body`,  </if>
-					<if test="attach != null"> `attach`,  </if>
-					<if test="storeId != null"> `store_id`,  </if>
-					<if test="cashierId != null"> `cashier_id`,  </if>
-					<if test="deviceNo != null"> `device_no`,  </if>
-					<if test="userId != null"> `user_id`,  </if>
-					<if test="userLogonId != null"> `user_logon_id`,  </if>
-					<if test="payTime != null"> `pay_time`,  </if>
-					<if test="payChannel != null"> `pay_channel`,  </if>
-					<if test="noCashCouponFee != null"> `no_cash_coupon_fee`,  </if>
-					<if test="cashCouponFee != null"> `cash_coupon_fee`,  </if>
-					<if test="cashFee != null"> `cash_fee`,  </if>
-					<if test="sign != null"> `sign`,  </if>
-					<if test="options != null"> `options`,  </if>
-					<if test="createTime != null"> `create_time`,  </if>
-					<if test="pushTime != null"> `push_time`,  </if>
-					<if test="pushIp != null"> `push_ip`,  </if>
-					<if test="mchtId != null"> `mcht_id`,  </if>
-					<if test="sn != null"> `sn` </if>
-				)
-		values
-		(
-					<if test="id != null"> #{id},  </if>
-					<if test="fbMerchantCode != null"> #{fbMerchantCode},  </if>
-					<if test="merchantOrderSn != null"> #{merchantOrderSn},  </if>
-					<if test="orderSn != null"> #{orderSn},  </if>
-					<if test="platformOrderNo != null"> #{platformOrderNo},  </if>
-					<if test="tradeNo != null"> #{tradeNo},  </if>
-					<if test="orderState != null"> #{orderState},  </if>
-					<if test="fnCoupon != null"> #{fnCoupon},  </if>
-					<if test="redPacket != null"> #{redPacket},  </if>
-					<if test="totalFee != null"> #{totalFee},  </if>
-					<if test="orderPrice != null"> #{orderPrice},  </if>
-					<if test="fee != null"> #{fee},  </if>
-					<if test="body != null"> #{body},  </if>
-					<if test="attach != null"> #{attach},  </if>
-					<if test="storeId != null"> #{storeId},  </if>
-					<if test="cashierId != null"> #{cashierId},  </if>
-					<if test="deviceNo != null"> #{deviceNo},  </if>
-					<if test="userId != null"> #{userId},  </if>
-					<if test="userLogonId != null"> #{userLogonId},  </if>
-					<if test="payTime != null"> #{payTime},  </if>
-					<if test="payChannel != null"> #{payChannel},  </if>
-					<if test="noCashCouponFee != null"> #{noCashCouponFee},  </if>
-					<if test="cashCouponFee != null"> #{cashCouponFee},  </if>
-					<if test="cashFee != null"> #{cashFee},  </if>
-					<if test="sign != null"> #{sign},  </if>
-					<if test="options != null"> #{options},  </if>
-					<if test="createTime != null"> #{createTime},  </if>
-					<if test="pushTime != null"> #{pushTime},  </if>
-					<if test="pushIp != null"> #{pushIp},  </if>
-					<if test="mchtId != null"> #{mchtId},  </if>
-					<if test="sn != null"> #{sn} </if>
-				)
-	</insert>
-	 
-	<update id="update" parameterType="com.java2nb.test.domain.OrderDO">
-		update fb_order 
-		<set>
-			<if test="fbMerchantCode != null">`fb_merchant_code` = #{fbMerchantCode}, </if>
-			<if test="merchantOrderSn != null">`merchant_order_sn` = #{merchantOrderSn}, </if>
-			<if test="orderSn != null">`order_sn` = #{orderSn}, </if>
-			<if test="platformOrderNo != null">`platform_order_no` = #{platformOrderNo}, </if>
-			<if test="tradeNo != null">`trade_no` = #{tradeNo}, </if>
-			<if test="orderState != null">`order_state` = #{orderState}, </if>
-			<if test="fnCoupon != null">`fn_coupon` = #{fnCoupon}, </if>
-			<if test="redPacket != null">`red_packet` = #{redPacket}, </if>
-			<if test="totalFee != null">`total_fee` = #{totalFee}, </if>
-			<if test="orderPrice != null">`order_price` = #{orderPrice}, </if>
-			<if test="fee != null">`fee` = #{fee}, </if>
-			<if test="body != null">`body` = #{body}, </if>
-			<if test="attach != null">`attach` = #{attach}, </if>
-			<if test="storeId != null">`store_id` = #{storeId}, </if>
-			<if test="cashierId != null">`cashier_id` = #{cashierId}, </if>
-			<if test="deviceNo != null">`device_no` = #{deviceNo}, </if>
-			<if test="userId != null">`user_id` = #{userId}, </if>
-			<if test="userLogonId != null">`user_logon_id` = #{userLogonId}, </if>
-			<if test="payTime != null">`pay_time` = #{payTime}, </if>
-			<if test="payChannel != null">`pay_channel` = #{payChannel}, </if>
-			<if test="noCashCouponFee != null">`no_cash_coupon_fee` = #{noCashCouponFee}, </if>
-			<if test="cashCouponFee != null">`cash_coupon_fee` = #{cashCouponFee}, </if>
-			<if test="cashFee != null">`cash_fee` = #{cashFee}, </if>
-			<if test="sign != null">`sign` = #{sign}, </if>
-			<if test="options != null">`options` = #{options}, </if>
-			<if test="createTime != null">`create_time` = #{createTime}, </if>
-			<if test="pushTime != null">`push_time` = #{pushTime}, </if>
-			<if test="pushIp != null">`push_ip` = #{pushIp}, </if>
-			<if test="mchtId != null">`mcht_id` = #{mchtId}, </if>
-			<if test="sn != null">`sn` = #{sn}</if>
-		</set>
-		where id = #{id}
-	</update>
-	
-	<delete id="remove">
-		delete from fb_order where id = #{value}
-	</delete>
-	
-	<delete id="batchRemove">
-		delete from fb_order where id in 
-		<foreach item="id" collection="array" open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</delete>
-
-</mapper>

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

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

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

@@ -147,7 +147,7 @@
                             <tr>
                                 <td>下载地址</td>
                                 <td>
-                                   <a href="https://gitee.com/xiongxyang/fiction_house" target="_blank">Gitee</a> /
+                                   <a href="https://gitee.com/novel_dev_team/fiction_house" target="_blank">Gitee</a> /
                                     <a href="https://github.com/201206030/fiction_house" target="_blank">Github</a>
                                 </td>
                             </tr>
@@ -155,8 +155,8 @@
                                 <td>Gitee</td>
                                 <td style="padding-bottom: 0;">
                                     <div class="layui-btn-container">
-                                        <a href='https://gitee.com/xiongxyang/fiction_house/stargazers'><img src='https://gitee.com/xiongxyang/fiction_house/badge/star.svg?theme=dark' alt='star'></img></a>
-                                        <a href='https://gitee.com/xiongxyang/fiction_house/members'><img src='https://gitee.com/xiongxyang/fiction_house/badge/fork.svg?theme=dark' alt='fork'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/fiction_house/stargazers'><img src='https://gitee.com/novel_dev_team/fiction_house/badge/star.svg?theme=dark' alt='star'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/fiction_house/members'><img src='https://gitee.com/novel_dev_team/fiction_house/badge/fork.svg?theme=dark' alt='fork'></img></a>
                                     </div>
                                 </td>
                             </tr>
@@ -200,7 +200,7 @@
                             <tr>
                                 <td>下载地址</td>
                                 <td>
-                                    <a href="https://gitee.com/xiongxyang/novel-plus" target="_blank">Gitee</a> /
+                                    <a href="https://gitee.com/novel_dev_team/novel-plus" target="_blank">Gitee</a> /
                                     <a href="https://github.com/201206030/novel-plus" target="_blank">Github</a>
                                 </td>
                             </tr>
@@ -208,8 +208,8 @@
                                 <td>Gitee</td>
                                 <td style="padding-bottom: 0;">
                                     <div class="layui-btn-container">
-                                        <a href='https://gitee.com/xiongxyang/novel-plus/stargazers'><img src='https://gitee.com/xiongxyang/novel-plus/badge/star.svg?theme=dark' alt='star'></img></a>
-                                        <a href='https://gitee.com/xiongxyang/novel-plus/members'><img src='https://gitee.com/xiongxyang/novel-plus/badge/fork.svg?theme=dark' alt='fork'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-plus/stargazers'><img src='https://gitee.com/novel_dev_team/novel-plus/badge/star.svg?theme=dark' alt='star'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-plus/members'><img src='https://gitee.com/novel_dev_team/novel-plus/badge/fork.svg?theme=dark' alt='fork'></img></a>
                                     </div>
                                 </td>
                             </tr>
@@ -253,7 +253,7 @@
                             <tr>
                                 <td>下载地址</td>
                                 <td>
-                                    <a href="https://gitee.com/xiongxyang/novel-cloud" target="_blank">Gitee</a> /
+                                    <a href="https://gitee.com/novel_dev_team/novel-cloud" target="_blank">Gitee</a> /
                                     <a href="https://github.com/201206030/novel-cloud" target="_blank">Github</a>
                                 </td>
                             </tr>
@@ -261,8 +261,8 @@
                                 <td>Gitee</td>
                                 <td style="padding-bottom: 0;">
                                     <div class="layui-btn-container">
-                                        <a href='https://gitee.com/xiongxyang/novel-cloud/stargazers'><img src='https://gitee.com/xiongxyang/novel-cloud/badge/star.svg?theme=dark' alt='star'></img></a>
-                                        <a href='https://gitee.com/xiongxyang/novel-cloud/members'><img src='https://gitee.com/xiongxyang/novel-cloud/badge/fork.svg?theme=dark' alt='fork'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-cloud/stargazers'><img src='https://gitee.com/novel_dev_team/novel-cloud/badge/star.svg?theme=dark' alt='star'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-cloud/members'><img src='https://gitee.com/novel_dev_team/novel-cloud/badge/fork.svg?theme=dark' alt='fork'></img></a>
                                     </div>
                                 </td>
                             </tr>

novel-admin/src/main/resources/templates/test/order/add.html

@@ -1,327 +0,0 @@
-<!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">付呗商户号：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="fbMerchantCode" name="fbMerchantCode"
-                                                   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="merchantOrderSn" name="merchantOrderSn"
-                                                   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="orderSn"
-                                                    name="orderSn"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="color">
-                                            </select>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">平台方订单号：</label>
-                                                                        <div class="col-sm-8">
-                                        
-                                            <select data-placeholder="--选择--" id="platformOrderNo"
-                                                    name="platformOrderNo"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="oa_leave_type">
-                                            </select>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">商户单号：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="hidden" id="tradeNo" name="tradeNo"/>
-                                            <div id="contentEditortradeNo">
-
-                                            </div>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">订单状态，1：未支付，2：支付成功，3：支付失败，4：支付取消：</label>
-                                                                        <div class="col-sm-8">
-                                        
-                                            <select data-placeholder="--选择--" id="orderState"
-                                                    name="orderState"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="yes_no">
-                                            </select>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">蜂鸟优惠卷抵扣：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="fnCoupon" name="fnCoupon"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">红包抵扣：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="redPacket" name="redPacket"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">实收金额(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="totalFee" name="totalFee"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">订单金额：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="orderPrice" name="orderPrice"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">手续费(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="fee" name="fee"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">对商品或交易的描述：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <img title="点击选择图片" id="picImagebody"
-                                                 style="cursor:pointer;width: 100px;height: 100px"
-                                                 src="/img/webuploader.png"/>
-                                            <input id="body" name="body"
-                                                   class="form-control"
-                                                   type="hidden">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">附加数据：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="hidden" id="attach" name="attach"/>
-                                            <div id="contentEditorattach">
-
-                                            </div>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">付呗系统的门店id：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="storeId" name="storeId"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">付呗系统的收银员id：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="cashierId" name="cashierId"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">设备终端号：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="deviceNo" name="deviceNo"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">微信顾客支付授权的“open_id”或者支付宝顾客的“buyer_user_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">
-                                                                                    <textarea id="userLogonId" name="userLogonId"
-                                                      class="form-control"></textarea>
-                                        
-                                    </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="payTime"
-                                                   name="payTime"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">支付通道:1微信、2支付宝、3银联：</label>
-                                                                        <div class="col-sm-8">
-                                        
-                                            <select data-placeholder="--选择--" id="payChannel"
-                                                    name="payChannel"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="del_flag">
-                                            </select>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">免充值代金券金额(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="noCashCouponFee" name="noCashCouponFee"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">预充值代金券金额(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="cashCouponFee" name="cashCouponFee"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">顾客实际支付金额(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="cashFee" name="cashFee"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">签名：</label>
-                                                                        <div class="col-sm-8">
-                                        
-                                            <select data-placeholder="--选择--" id="sign"
-                                                    name="sign"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="theme">
-                                            </select>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">其它选项：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <img title="点击选择图片" id="picImageoptions"
-                                                 style="cursor:pointer;width: 100px;height: 100px"
-                                                 src="/img/webuploader.png"/>
-                                            <input id="options" name="options"
-                                                   class="form-control"
-                                                   type="hidden">
-                                        
-                                    </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">
-                                                                            <label class="col-sm-3 control-label">推送时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="pushTime"
-                                                   name="pushTime"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">推送IP：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="hidden" id="pushIp" name="pushIp"/>
-                                            <div id="contentEditorpushIp">
-
-                                            </div>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">商户id：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="mchtId" name="mchtId"
-                                                   class="form-control"
-                                                   type="number">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">QR编号：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="sn" name="sn"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </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/test/order/add.js">
-</script>
-</body>
-</html>

novel-admin/src/main/resources/templates/test/order/detail.html

@@ -1,315 +0,0 @@
-<!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="${order.id}"
-                       type="hidden">
-                                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">付呗商户号：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${order.fbMerchantCode}">
-                            </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="${order.merchantOrderSn}">
-                            </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="color"
-                                 th:attr="dict-value=${order.orderSn}">
-                            </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="oa_leave_type"
-                                 th:attr="dict-value=${order.platformOrderNo}">
-                            </div>
-
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">商户单号：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:utext="${order.tradeNo}"></div>
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">订单状态，1：未支付，2：支付成功，3：支付失败，4：支付取消：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8 dict-type" dict-type="yes_no"
-                                 th:attr="dict-value=${order.orderState}">
-                            </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="${order.fnCoupon}">
-                            </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="${order.redPacket}">
-                            </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="${order.totalFee}">
-                            </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="${order.orderPrice}">
-                            </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="${order.fee}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">对商品或交易的描述：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8">
-                            <img id="picImagebody"
-                                 style="cursor:pointer;width: 100px;height: 100px"
-                                 th:src="${order.body}==null?'/img/webuploader.png':${order.body}"/>
-                        </div>
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">附加数据：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:utext="${order.attach}"></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="${order.storeId}">
-                            </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="${order.cashierId}">
-                            </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="${order.deviceNo}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">微信顾客支付授权的“open_id”或者支付宝顾客的“buyer_user_id”：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${order.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="${order.userLogonId}">
-                            </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="${order.payTime}==null?null:${#dates.format(order.payTime,'yyyy-MM-dd HH:mm:ss')}">
-                            </div>
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">支付通道:1微信、2支付宝、3银联：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8 dict-type" dict-type="del_flag"
-                                 th:attr="dict-value=${order.payChannel}">
-                            </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="${order.noCashCouponFee}">
-                            </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="${order.cashCouponFee}">
-                            </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="${order.cashFee}">
-                            </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="theme"
-                                 th:attr="dict-value=${order.sign}">
-                            </div>
-
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">其它选项：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8">
-                            <img id="picImageoptions"
-                                 style="cursor:pointer;width: 100px;height: 100px"
-                                 th:src="${order.options}==null?'/img/webuploader.png':${order.options}"/>
-                        </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="${order.createTime}==null?null:${#dates.format(order.createTime,'yyyy-MM-dd HH:mm:ss')}">
-                            </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="${order.pushTime}==null?null:${#dates.format(order.pushTime,'yyyy-MM-dd HH:mm:ss')}">
-                            </div>
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">推送IP：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:utext="${order.pushIp}"></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="${order.mchtId}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">QR编号：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${order.sn}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                    </form>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-<div th:include="include::footer"></div>
-</body>
-</html>

novel-admin/src/main/resources/templates/test/order/edit.html

@@ -1,323 +0,0 @@
-<!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="${order.id}"
-                               type="hidden">
-                                                                                                                                        <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">付呗商户号：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="fbMerchantCode" name="fbMerchantCode"
-                                                   th:value="${order.fbMerchantCode}"
-                                                   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="merchantOrderSn" name="merchantOrderSn"
-                                                   th:value="${order.merchantOrderSn}"
-                                                   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="orderSn"
-                                                    name="orderSn"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="color"
-                                                    th:attr="dict-value=${order.orderSn}" >
-                                            </select>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">平台方订单号：</label>
-                                                                        <div class="col-sm-8">
-                                        
-                                            <select data-placeholder="--选择--" id="platformOrderNo"
-                                                    name="platformOrderNo"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="oa_leave_type"
-                                                    th:attr="dict-value=${order.platformOrderNo}" >
-                                            </select>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">商户单号：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="hidden" id="tradeNo" name="tradeNo" th:value="${order.tradeNo}"/>
-                                            <div id="contentEditortradeNo">
-
-                                            </div>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">订单状态，1：未支付，2：支付成功，3：支付失败，4：支付取消：</label>
-                                                                        <div class="col-sm-8">
-                                        
-                                            <select data-placeholder="--选择--" id="orderState"
-                                                    name="orderState"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="yes_no"
-                                                    th:attr="dict-value=${order.orderState}" >
-                                            </select>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">蜂鸟优惠卷抵扣：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="fnCoupon" name="fnCoupon"
-                                                   th:value="${order.fnCoupon}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">红包抵扣：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="redPacket" name="redPacket"
-                                                   th:value="${order.redPacket}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">实收金额(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="totalFee" name="totalFee"
-                                                   th:value="${order.totalFee}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">订单金额：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="orderPrice" name="orderPrice"
-                                                   th:value="${order.orderPrice}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">手续费(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="fee" name="fee"
-                                                   th:value="${order.fee}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">对商品或交易的描述：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <img title="点击选择图片" id="picImagebody"
-                                                 style="cursor:pointer;width: 100px;height: 100px"
-                                                 th:src="${order.body}==null?'/img/webuploader.png':${order.body}"/>
-                                            <input id="body" name="body" th:value="${order.body}"
-                                                   class="form-control"
-                                                   type="hidden">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">附加数据：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="hidden" id="attach" name="attach" th:value="${order.attach}"/>
-                                            <div id="contentEditorattach">
-
-                                            </div>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">付呗系统的门店id：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="storeId" name="storeId"
-                                                   th:value="${order.storeId}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">付呗系统的收银员id：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="cashierId" name="cashierId"
-                                                   th:value="${order.cashierId}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">设备终端号：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="deviceNo" name="deviceNo"
-                                                   th:value="${order.deviceNo}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">微信顾客支付授权的“open_id”或者支付宝顾客的“buyer_user_id”：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="userId" name="userId"
-                                                   th:value="${order.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">
-                                                                                    <textarea id="userLogonId" name="userLogonId"
-                                                      class="form-control"  th:text="${order.userLogonId}"></textarea>
-                                                                            </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="payTime"
-                                                   name="payTime"
-                                                   th:value="${order.payTime}==null?null:${#dates.format(order.payTime,'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">
-                                                                            <label class="col-sm-3 control-label">支付通道:1微信、2支付宝、3银联：</label>
-                                                                        <div class="col-sm-8">
-                                        
-                                            <select data-placeholder="--选择--" id="payChannel"
-                                                    name="payChannel"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="del_flag"
-                                                    th:attr="dict-value=${order.payChannel}" >
-                                            </select>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">免充值代金券金额(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="noCashCouponFee" name="noCashCouponFee"
-                                                   th:value="${order.noCashCouponFee}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">预充值代金券金额(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="cashCouponFee" name="cashCouponFee"
-                                                   th:value="${order.cashCouponFee}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">顾客实际支付金额(元)：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="cashFee" name="cashFee"
-                                                   th:value="${order.cashFee}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">签名：</label>
-                                                                        <div class="col-sm-8">
-                                        
-                                            <select data-placeholder="--选择--" id="sign"
-                                                    name="sign"
-                                                    class="form-control chosen-select" tabindex="2"
-                                                    dict-type="theme"
-                                                    th:attr="dict-value=${order.sign}" >
-                                            </select>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">其它选项：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <img title="点击选择图片" id="picImageoptions"
-                                                 style="cursor:pointer;width: 100px;height: 100px"
-                                                 th:src="${order.options}==null?'/img/webuploader.png':${order.options}"/>
-                                            <input id="options" name="options" th:value="${order.options}"
-                                                   class="form-control"
-                                                   type="hidden">
-                                                                            </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="${order.createTime}==null?null:${#dates.format(order.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">
-                                                                            <label class="col-sm-3 control-label">推送时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="pushTime"
-                                                   name="pushTime"
-                                                   th:value="${order.pushTime}==null?null:${#dates.format(order.pushTime,'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">
-                                                                            <label class="col-sm-3 control-label">推送IP：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="hidden" id="pushIp" name="pushIp" th:value="${order.pushIp}"/>
-                                            <div id="contentEditorpushIp">
-
-                                            </div>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">商户id：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="mchtId" name="mchtId"
-                                                   th:value="${order.mchtId}"
-                                                   class="form-control"
-                                                   type="number">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">QR编号：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="sn" name="sn"
-                                                   th:value="${order.sn}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </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/test/order/edit.js">
-</script>
-</body>
-</html>

novel-admin/src/main/resources/templates/test/order/order.html

@@ -1,66 +0,0 @@
-<!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-left">
-                        <button shiro:hasPermission="test:order:add" type="button"
-                                class="btn  btn-primary" onclick="add()">
-                            <i class="fa fa-plus" aria-hidden="true"></i>添加
-                        </button>
-                        <button shiro:hasPermission="test:order:batchRemove" type="button"
-                                class="btn  btn-danger"
-                                onclick="batchRemove()">
-                            <i class="fa fa-trash" aria-hidden="true"></i>删除
-                        </button>
-                    </div>
-                    <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">
-                            <input id="id" name="id" type="text" class="form-control"
-                                   placeholder="主键">
-                        </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="test:order:edit">
-    <script type="text/javascript">
-        s_edit_h = '';
-    </script>
-</div>
-<div shiro:hasPermission="test:order:remove">
-    <script type="text/javascript">
-        var s_remove_h = '';
-    </script>
-</div>
-<div th:include="include :: footer"></div>
-<script type="text/javascript" src="/js/appjs/test/order/order.js"></script>
-</body>
-</html>

novel-admin/src/test/java/com/java2nb/testDemo/TestDemo.java

@@ -1,25 +0,0 @@
-package com.java2nb.testDemo;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController()
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class TestDemo {
-    @Autowired
-    RedisTemplate redisTemplate;
-
-    @Test
-    public void test() {
-        redisTemplate.opsForValue().set("a", "b");
-        System.out.println(redisTemplate.opsForValue().get("a"));
-    }
-
-    ;
-}

novel-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>3.0.2</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -123,6 +123,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
 
 
     </dependencies>

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

@@ -1,21 +1,30 @@
 package com.java2nb.novel.core.advice;
 
 import com.java2nb.novel.core.bean.ResultBean;
+import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.exception.BusinessException;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.validation.BindException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 /**
  * 通用的异常处理器
  *
  * @author 11797*/
 @Slf4j
-@ControllerAdvice
-@ResponseBody
+@RestControllerAdvice(basePackages = "com.java2nb.novel.controller")
 public class CommonExceptionHandler {
 
+    /**
+     * 处理后台数据校验异常
+     * */
+    @ExceptionHandler(BindException.class)
+    public ResultBean handlerBindException(BindException e){
+        log.error(e.getMessage(),e);
+        return ResultBean.fail(ResponseStatus.PARAM_ERROR);
+    }
+
     /**
      * 处理业务异常
      * */

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

@@ -0,0 +1,26 @@
+package com.java2nb.novel.core.advice;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ * 页面异常处理器
+ *
+ * @author 11797
+ */
+@Slf4j
+@ControllerAdvice(basePackages = "com.java2nb.novel.page")
+public class PageExceptionHandler {
+
+
+    /**
+     * 处理所有异常
+     */
+    @ExceptionHandler(Exception.class)
+    public String handlerException(Exception e) {
+        log.error(e.getMessage(), e);
+        //跳转页面过程中出现异常时统一跳转到404页面
+        return "404";
+    }
+}

novel-common/src/main/java/com/java2nb/novel/core/bean/PageBean.java

@@ -0,0 +1,53 @@
+package com.java2nb.novel.core.bean;
+
+import com.github.pagehelper.PageInfo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 封装通用分页数据,接收PageHelper、SpringData等框架的分页数据，转换成通用的PageBean对象
+ * @author xiongxiaoyang
+ * @version 1.0
+ * @since 2021/2/4
+ * @param <T> 分页集合类型
+ */
+@Data
+public class PageBean<T> {
+
+    private Integer pageNum;
+    private Integer pageSize;
+    private Long total;
+    private List<? extends T> list;
+
+
+    /**
+     * 该构造函数用于PageHelper工具进行分页查询的场景
+     * 接收PageHelper分页后的list
+     */
+    public PageBean(List<T> list){
+        PageInfo<T> pageInfo = new PageInfo<>(list);
+        this.pageNum = pageInfo.getPageNum();
+        this.pageSize = pageInfo.getPageSize();
+        this.total = pageInfo.getTotal();
+        this.list = pageInfo.getList();
+
+    }
+
+    /**
+     * 该构造函数用于通用分页查询的场景
+     * 接收普通分页数据和普通集合
+     */
+    public PageBean(Integer pageNum, Integer pageSize, Long total, List<T> list) {
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+        this.total = total;
+        this.list = list;
+    }
+
+
+    //TODO 使用其他的分页工具或框架进行分页查询的场景
+
+
+
+}

novel-common/src/main/java/com/java2nb/novel/core/bean/ResultBean.java

@@ -8,8 +8,9 @@ import java.io.Serializable;
 
 /**
  * 自定义响应结构
- * @author 11797
+ *
  * @param <T>
+ * @author 11797
  */
 @Data
 public class ResultBean<T> implements Serializable {
@@ -19,20 +20,20 @@ public class ResultBean<T> implements Serializable {
 
     /**
      * 响应消息
-     * */
+     */
     private String msg = ResponseStatus.OK.getMsg();
     /**
      * 响应中的数据
-     * */
+     */
     private T data;
 
     private ResultBean() {
 
     }
 
-    private ResultBean(ResponseStatus ResponseStatus) {
-        this.code = ResponseStatus.getCode();;
-        this.msg = ResponseStatus.getMsg();
+    private ResultBean(ResponseStatus responseStatus) {
+        this.code = responseStatus.getCode();
+        this.msg = responseStatus.getMsg();
     }
 
     private ResultBean(T data) {
@@ -40,34 +41,33 @@ public class ResultBean<T> implements Serializable {
     }
 
 
-
     /**
      * 业务处理成功,无数据返回
-     * */
-    public static ResultBean ok() {
-        return new ResultBean();
+     */
+    public static ResultBean<Void> ok() {
+        return new ResultBean<>();
     }
 
     /**
      * 业务处理成功，有数据返回
-     * */
-    public static <T> ResultBean ok(T data) {
-        return new ResultBean(data);
+     */
+    public static <T> ResultBean<T> ok(T data) {
+        return new ResultBean<>(data);
     }
 
     /**
      * 业务处理失败
-     * */
-    public static ResultBean fail(ResponseStatus ResponseStatus) {
-        return new ResultBean(ResponseStatus);
+     */
+    public static ResultBean<Void> fail(ResponseStatus responseStatus) {
+        return new ResultBean<>(responseStatus);
     }
 
 
     /**
      * 系统错误
-     * */
-    public static ResultBean error() {
-        return new ResultBean(ResponseStatus.ERROR);
+     */
+    public static ResultBean<Void> error() {
+        return new ResultBean<>(ResponseStatus.ERROR);
     }
 }
 

novel-common/src/main/java/com/java2nb/novel/core/cache/impl/EhCacheServiceImpl.java

@@ -16,108 +16,107 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 @Service
 public class EhCacheServiceImpl implements CacheService {
-	
-	private final CacheManager cacheManager ;
- 
 
-	/**
-	 * 获得一个Cache，没有则创建一个。
-	 * @return
-	 */
-	private Cache getCache(){
-	
-		Cache cache = cacheManager.getCache("util_cache");
-		return cache;
-	}
-	
- 
-	@Override
-	public String get(String key) {
-		Element element = getCache().get(key);
-		return element==null?null:(String)element.getObjectValue();
-	}
-
-	@Override
-	public void set(String key, String value) {
-		Element element = new Element(key, value);
-		Cache cache = getCache();
-		//不过期
-		cache.getCacheConfiguration().setEternal(true);
-		cache.put(element);
-
-	}
-
-	@Override
-	public void set(String key, String value, long timeout) {
-		Element element = new Element(key, value);
-		element.setTimeToLive((int) timeout);
-		Cache cache = getCache();
-		cache.put(element);
-
-	}
-
-	@Override
-	public void del(String key) {
-		getCache().remove(key);
+    private final CacheManager cacheManager;
 
 
-	}
+    /**
+     * 获得一个Cache，没有则创建一个。
+     *
+     * @return
+     */
+    private Cache getCache() {
 
-	@Override
-	public boolean contains(String key) {
-		return getCache().isKeyInCache(key);
-	}
-
-	@Override
-	public void expire(String key, long timeout) {
-		Element element = getCache().get(key);
-		if (element != null) {
-			Object value = element.getValue();
-			element = new Element(key, value);
-			element.setTimeToLive((int)timeout);
-			Cache cache = getCache();
-			cache.put(element);
-		}
-	}
+        Cache cache = cacheManager.getCache("util_cache");
+        return cache;
+    }
 
 
-	/**
-	 * 根据key获取缓存的Object类型数据
-	 */
-	@Override
-	public Object getObject(String key) {
-		Element element = getCache().get(key);
-		return element==null?null:element.getObjectValue();
-	}
+    @Override
+    public String get(String key) {
+        Element element = getCache().get(key);
+        return element == null ? null : (String) element.getObjectValue();
+    }
+
+    @Override
+    public void set(String key, String value) {
+        Element element = new Element(key, value);
+        Cache cache = getCache();
+        //不过期
+        cache.getCacheConfiguration().setEternal(true);
+        cache.put(element);
+
+    }
+
+    @Override
+    public void set(String key, String value, long timeout) {
+        Element element = new Element(key, value);
+        element.setTimeToLive((int) timeout);
+        Cache cache = getCache();
+        cache.put(element);
+
+    }
+
+    @Override
+    public void del(String key) {
+        getCache().remove(key);
 
 
-	/**
-	 * 设置Object类型的缓存
-	 */
-	@Override
-	public void setObject(String key, Object value) {
-		Element element = new Element(key, value);
-		Cache cache = getCache();
-		//不过期
-		cache.getCacheConfiguration().setEternal(true);
-		cache.put(element);
-		
-	}
+    }
+
+    @Override
+    public boolean contains(String key) {
+        return getCache().isKeyInCache(key);
+    }
+
+    @Override
+    public void expire(String key, long timeout) {
+        Element element = getCache().get(key);
+        if (element != null) {
+            Object value = element.getValue();
+            element = new Element(key, value);
+            element.setTimeToLive((int) timeout);
+            Cache cache = getCache();
+            cache.put(element);
+        }
+    }
 
 
-	/**
-	 * 设置一个有过期时间的Object类型的缓存,单位秒
-	 */
-	@Override
-	public void setObject(String key, Object value, long timeout) {
-		Element element = new Element(key, value);
-		element.setTimeToLive((int) timeout);
-		Cache cache = getCache();
-		cache.put(element);
-		
-	}
+    /**
+     * 根据key获取缓存的Object类型数据
+     */
+    @Override
+    public Object getObject(String key) {
+        Element element = getCache().get(key);
+        return element == null ? null : element.getObjectValue();
+    }
 
 
+    /**
+     * 设置Object类型的缓存
+     */
+    @Override
+    public void setObject(String key, Object value) {
+        Element element = new Element(key, value);
+        Cache cache = getCache();
+        //不过期
+        cache.getCacheConfiguration().setEternal(true);
+        cache.put(element);
+
+    }
+
+
+    /**
+     * 设置一个有过期时间的Object类型的缓存,单位秒
+     */
+    @Override
+    public void setObject(String key, Object value, long timeout) {
+        Element element = new Element(key, value);
+        element.setTimeToLive((int) timeout);
+        Cache cache = getCache();
+        cache.put(element);
+
+    }
 
 
 }

novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java

@@ -68,6 +68,12 @@ public enum ResponseStatus {
      * */
     ES_SEARCH_FAIL(9001,"搜索引擎查询错误！"),
 
+    /**
+     * 文件相关错误
+     * */
+    FILE_DIR_MAKE_FAIL(10001,"目录创建失败"),
+    FILE_NOT_IMAGE(10002,"请上传图片类型的文件"),
+    FILE_SIZE_LIMIT(10003,"文件大小超出限制"),
 
     /**
      * 其他通用错误

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

@@ -19,7 +19,7 @@ public class BeanUtil {
      * @return 新集合
      * */
     @SneakyThrows
-    public static <T> List<T> copyList(List source,Class<T> targetClass){
+    public static <T> List<T> copyList(List<? super T> source,Class<T> targetClass){
         List<T> target = new ArrayList<>(source.size());
         for( int i = 0 ; i < source.size() ; i++){
             Object sourceItem = source.get(i);

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

@@ -1,6 +1,7 @@
 package com.java2nb.novel.core.utils;
 
 import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.Charsets;
 import org.apache.http.client.utils.DateUtils;
@@ -11,21 +12,24 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 
 import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
 import java.io.*;
 import java.util.Date;
 import java.util.Objects;
 
 /**
  * 文件操作工具类
+ *
  * @author 11797
  */
+@UtilityClass
 @Slf4j
 public class FileUtil {
 
     /**
      * 网络图片转本地
-     * */
-    public static String network2Local(String picSrc,String picSavePath,String visitPrefix) {
+     */
+    public String network2Local(String picSrc, String picSavePath, String visitPrefix) {
         InputStream input = null;
         OutputStream out = null;
         try {
@@ -50,37 +54,70 @@ public class FileUtil {
             }
 
             out.flush();
-            if( ImageIO.read(picFile) == null){
+            if (ImageIO.read(picFile) == null) {
                 picSrc = "/images/default.gif";
             }
 
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
 
             picSrc = "/images/default.gif";
-        }finally {
-            if(input != null){
-                try {
-                    input.close();
-                } catch (IOException e) {
-                    log.error(e.getMessage(),e);
-                }finally {
-                    if(out != null){
-                        try {
-                            out.close();
-                        } catch (IOException e) {
-                            log.error(e.getMessage(),e);
-                        }
-                    }
-                }
-            }
+        } finally {
+            closeStream(input, out);
         }
 
 
-
         return picSrc;
     }
 
+    @SneakyThrows
+    private void closeStream(InputStream input, OutputStream out) {
+        if (input != null) {
+            input.close();
+        }
+        if (out != null) {
+            out.close();
+        }
+    }
+
+
+    /**
+     * 判断文件是否为图片
+     *
+     * @param file 需要判断的文件
+     * @return true:是图片，false:不是图片
+     */
+    @SneakyThrows
+    public boolean isImage(File file) {
+
+        BufferedImage bi = ImageIO.read(file);
+
+        return bi != null;
+
+
+    }
+
+    public void writeContentToFile(String fileSavePath, String fileSrc, String content) {
+        OutputStream out = null;
+        try {
+            File file = new File(fileSavePath + fileSrc);
+            File parentFile = file.getParentFile();
+            if (!parentFile.exists()) {
+                parentFile.mkdirs();
+            }
+            out = new FileOutputStream(file);
+            out.write(content.getBytes());
+            byte[] b = new byte[4096];
+            out.flush();
+
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException("文件写入失败");
+        } finally {
+            closeStream(null, out);
+        }
+
+    }
 
 
 }

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

@@ -1,9 +1,6 @@
 package com.java2nb.novel.core.utils;
 
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -28,4 +25,23 @@ public class HttpUtil {
             return null;
         }
     }
+
+    public static String getByHttpClientWithChrome(String url) {
+        try {
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("user-agent","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36");
+            HttpEntity<String> requestEntity = new HttpEntity<>(null, headers);
+            ResponseEntity<String> forEntity = restTemplate.exchange(url.toString(), HttpMethod.GET, requestEntity, String.class);
+
+            if (forEntity.getStatusCode() == HttpStatus.OK) {
+                return forEntity.getBody();
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

novel-common/src/main/java/com/java2nb/novel/core/valid/AddGroup.java

@@ -0,0 +1,11 @@
+package com.java2nb.novel.core.valid;
+
+/**
+ * 新增数据的校验分组
+ * @author xiongxiaoyang
+ */
+public interface AddGroup {
+
+
+
+}

novel-common/src/main/java/com/java2nb/novel/core/valid/UpdateGroup.java

@@ -0,0 +1,11 @@
+package com.java2nb.novel.core.valid;
+
+/**
+ * 更新数据的校验分组
+ * @author xiongxiaoyang
+ */
+public interface UpdateGroup {
+
+
+
+}

novel-common/src/main/java/com/java2nb/novel/entity/News.java

@@ -1,11 +1,9 @@
 package com.java2nb.novel.entity;
 
-
-import javax.annotation.Generated;
-import java.io.Serializable;
 import java.util.Date;
+import javax.annotation.Generated;
 
-public class News implements Serializable {
+public class News {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Long id;
 
@@ -21,6 +19,9 @@ public class News implements Serializable {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String title;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long readCount;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Date createTime;
 
@@ -86,6 +87,16 @@ public class News implements Serializable {
         this.title = title == null ? null : title.trim();
     }
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getReadCount() {
+        return readCount;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setReadCount(Long readCount) {
+        this.readCount = readCount;
+    }
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public Date getCreateTime() {
         return createTime;

novel-common/src/main/java/com/java2nb/novel/entity/User.java

@@ -1,36 +1,56 @@
 package com.java2nb.novel.entity;
 
+import com.java2nb.novel.core.valid.AddGroup;
+import com.java2nb.novel.core.valid.UpdateGroup;
+
 import java.util.Date;
 import javax.annotation.Generated;
+import javax.validation.constraints.*;
 
 public class User {
+
+    @Null(groups = {AddGroup.class, UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Long id;
 
+
+    @NotBlank(groups = {AddGroup.class},message="手机号不能为空！")
+    @Pattern(groups = {AddGroup.class},regexp="^1[3|4|5|6|7|8|9][0-9]{9}$",message="手机号格式不正确！")
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String username;
 
+    @NotBlank(groups = {AddGroup.class},message="密码不能为空！")
+    @Null(groups = {UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String password;
 
+    @Null(groups = {AddGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String nickName;
 
+    @Null(groups = {AddGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String userPhoto;
 
+    @Null(groups = {AddGroup.class})
+    @Min(value = 0,groups = {UpdateGroup.class})
+    @Max(value = 1,groups = {UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Byte userSex;
 
+    @Null(groups = {AddGroup.class,UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Long accountBalance;
 
+    @Null(groups = {AddGroup.class,UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Byte status;
 
+    @Null(groups = {AddGroup.class,UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Date createTime;
 
+    @Null(groups = {AddGroup.class,UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Date updateTime;
 

novel-common/src/main/java/com/java2nb/novel/mapper/NewsDynamicSqlSupport.java

@@ -25,6 +25,9 @@ public final class NewsDynamicSqlSupport {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<String> title = news.title;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> readCount = news.readCount;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Date> createTime = news.createTime;
 
@@ -52,6 +55,8 @@ public final class NewsDynamicSqlSupport {
 
         public final SqlColumn<String> title = column("title", JDBCType.VARCHAR);
 
+        public final SqlColumn<Long> readCount = column("read_count", JDBCType.BIGINT);
+
         public final SqlColumn<Date> createTime = column("create_time", JDBCType.TIMESTAMP);
 
         public final SqlColumn<Long> createUserId = column("create_user_id", JDBCType.BIGINT);

novel-common/src/main/java/com/java2nb/novel/mapper/NewsMapper.java

@@ -35,7 +35,7 @@ import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 @Mapper
 public interface NewsMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    BasicColumn[] selectList = BasicColumn.columnList(id, catId, catName, sourceName, title, createTime, createUserId, updateTime, updateUserId, content);
+    BasicColumn[] selectList = BasicColumn.columnList(id, catId, catName, sourceName, title, readCount, createTime, createUserId, updateTime, updateUserId, content);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
@@ -66,6 +66,7 @@ public interface NewsMapper {
         @Result(column="cat_name", property="catName", jdbcType=JdbcType.VARCHAR),
         @Result(column="source_name", property="sourceName", jdbcType=JdbcType.VARCHAR),
         @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR),
+        @Result(column="read_count", property="readCount", jdbcType=JdbcType.BIGINT),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="create_user_id", property="createUserId", jdbcType=JdbcType.BIGINT),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@@ -103,6 +104,7 @@ public interface NewsMapper {
             .map(catName).toProperty("catName")
             .map(sourceName).toProperty("sourceName")
             .map(title).toProperty("title")
+            .map(readCount).toProperty("readCount")
             .map(createTime).toProperty("createTime")
             .map(createUserId).toProperty("createUserId")
             .map(updateTime).toProperty("updateTime")
@@ -119,6 +121,7 @@ public interface NewsMapper {
             .map(catName).toProperty("catName")
             .map(sourceName).toProperty("sourceName")
             .map(title).toProperty("title")
+            .map(readCount).toProperty("readCount")
             .map(createTime).toProperty("createTime")
             .map(createUserId).toProperty("createUserId")
             .map(updateTime).toProperty("updateTime")
@@ -135,6 +138,7 @@ public interface NewsMapper {
             .map(catName).toPropertyWhenPresent("catName", record::getCatName)
             .map(sourceName).toPropertyWhenPresent("sourceName", record::getSourceName)
             .map(title).toPropertyWhenPresent("title", record::getTitle)
+            .map(readCount).toPropertyWhenPresent("readCount", record::getReadCount)
             .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
             .map(createUserId).toPropertyWhenPresent("createUserId", record::getCreateUserId)
             .map(updateTime).toPropertyWhenPresent("updateTime", record::getUpdateTime)
@@ -177,6 +181,7 @@ public interface NewsMapper {
                 .set(catName).equalTo(record::getCatName)
                 .set(sourceName).equalTo(record::getSourceName)
                 .set(title).equalTo(record::getTitle)
+                .set(readCount).equalTo(record::getReadCount)
                 .set(createTime).equalTo(record::getCreateTime)
                 .set(createUserId).equalTo(record::getCreateUserId)
                 .set(updateTime).equalTo(record::getUpdateTime)
@@ -191,6 +196,7 @@ public interface NewsMapper {
                 .set(catName).equalToWhenPresent(record::getCatName)
                 .set(sourceName).equalToWhenPresent(record::getSourceName)
                 .set(title).equalToWhenPresent(record::getTitle)
+                .set(readCount).equalToWhenPresent(record::getReadCount)
                 .set(createTime).equalToWhenPresent(record::getCreateTime)
                 .set(createUserId).equalToWhenPresent(record::getCreateUserId)
                 .set(updateTime).equalToWhenPresent(record::getUpdateTime)
@@ -205,6 +211,7 @@ public interface NewsMapper {
             .set(catName).equalTo(record::getCatName)
             .set(sourceName).equalTo(record::getSourceName)
             .set(title).equalTo(record::getTitle)
+            .set(readCount).equalTo(record::getReadCount)
             .set(createTime).equalTo(record::getCreateTime)
             .set(createUserId).equalTo(record::getCreateUserId)
             .set(updateTime).equalTo(record::getUpdateTime)
@@ -221,6 +228,7 @@ public interface NewsMapper {
             .set(catName).equalToWhenPresent(record::getCatName)
             .set(sourceName).equalToWhenPresent(record::getSourceName)
             .set(title).equalToWhenPresent(record::getTitle)
+            .set(readCount).equalToWhenPresent(record::getReadCount)
             .set(createTime).equalToWhenPresent(record::getCreateTime)
             .set(createUserId).equalToWhenPresent(record::getCreateUserId)
             .set(updateTime).equalToWhenPresent(record::getUpdateTime)

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

@@ -71,8 +71,7 @@ sharding:
 
 
 
-pic:
+txt:
   save:
-    type: 2 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
-    storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
-    path: /var/pic  #图片保存路径
+    storage: db #存储介质，db：数据库，file：txt文本
+    path: /Users/xiongxiaoyang/books  #txt小说文本保存路径

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

@@ -0,0 +1,85 @@
+spring:
+  profiles:
+    include: [common]
+  main:
+    allow-bean-definition-overriding: true
+  #Redis服务器IP
+  redis:
+    host: 127.0.0.1
+    #Redis服务器连接端口
+    port: 6379
+    #Redis服务器连接密码
+    password: test
+    jedis:
+      pool:
+        #连接池最大连接数（使用负值表示没有限制）
+        max-active: 8
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 1
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 8
+        #连接池中的最小空闲连接
+        min-idle: 0
+    #连接超时时间（毫秒）
+    timeout: 30000
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/novel_biz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: test123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+
+####使用shardingJdbc时，
+####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误
+##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR
+
+sharding:
+  jdbc:
+    datasource:
+      names: ds0 #,ds1
+      ds0:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: root
+        password: test123456
+    #      ds1:
+    #        type: com.alibaba.druid.pool.DruidDataSource
+    #        driver-class-name: com.mysql.jdbc.Driver
+    #        url: jdbc:mysql://localhost:3306/novel_plus2
+    #        username: root
+    #        password: test123456
+    config:
+      sharding:
+        props:
+          sql.show: true
+        tables:
+          book_content:  #book_content表
+            key-generator-column-name: id  #主键
+            actual-data-nodes: ds${0}.book_content${0..9}  #数据节点
+            #            database-strategy:  #分库策略
+            #              inline:
+            #                sharding-column: book_id
+            #                algorithm-expression: ds${book_id % 10}
+            table-strategy:  #分表策略
+              inline:
+                shardingColumn: index_id
+                algorithm-expression: book_content${index_id % 10}
+
+
+logging:
+  level:
+    root: error
+    com.java2nb: error
+
+
+
+txt:
+  save:
+    storage: db #存储介质，db：数据库，file：txt文本
+    path: /Users/xiongxiaoyang/books  #txt小说文本保存路径
+
+
+
+
+

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

@@ -1,17 +0,0 @@
-spring:
-  profiles:
-    include: [common]
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/novel_biz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: root
-    driver-class-name: com.mysql.cj.jdbc.Driver
-
-
-pic:
-  save:
-    type: 2  #图片保存方式, 1不保存，使用网络图片 ，2本地保存
-    path: /var/pic  #图片保存路径
-
-
-

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

@@ -11,6 +11,11 @@ spring:
     generator:
       write-numbers-as-strings: true
 
+  #上传文件的最大值（1M）
+  servlet:
+    multipart:
+      max-file-size: 1048576
+
 #缓存类型，ehcache(默认)、redis
 cache:
   type: ehcache
@@ -26,3 +31,5 @@ logging:
   config: classpath:logback-boot.xml
 
 
+
+

novel-common/src/main/resources/banner.txt

@@ -0,0 +1,15 @@
+${AnsiColor.CYAN}
+
+--------------------------------------------------------------------------------
+${AnsiColor.RED}
+||   / |  / /
+||  /  | / /  ___     //  ___      ___      _   __
+|| / /||/ / //___) ) // //   ) ) //   ) ) // ) )  ) )
+||/ / |  / //       // //       //   / / // / /  / /
+|  /  | / ((____   // ((____   ((___/ / // / /  / /   小说精品屋欢迎您！！！
+
+                                               -------Powered By XXY
+${AnsiColor.CYAN}
+--------------------------------------------------------------------------------
+${AnsiColor.BRIGHT_YELLOW}
+::: Spring-Boot ${spring-boot.formatted-version} :::

novel-common/src/main/resources/mybatis/generatorConfig.xml

@@ -44,7 +44,7 @@
         </javaClientGenerator>
 
         <!--生成全部表tableName设为%-->
-        <table tableName="book"/>
+        <table tableName="book_index"/>
 
         <!-- 指定数据库表 -->
         <!--<table schema="jly" tableName="job_position" domainObjectName="JobPositionTest"/>-->

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>3.0.2</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java

@@ -1,18 +1,12 @@
 package com.java2nb.novel.controller;
 
-import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
 import com.java2nb.novel.core.bean.ResultBean;
-import com.java2nb.novel.core.utils.BeanUtil;
 import com.java2nb.novel.entity.CrawlSingleTask;
 import com.java2nb.novel.entity.CrawlSource;
 import com.java2nb.novel.service.CrawlService;
-import com.java2nb.novel.vo.CrawlSingleTaskVO;
-import com.java2nb.novel.vo.CrawlSourceVO;
 import lombok.RequiredArgsConstructor;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author Administrator
@@ -29,7 +23,7 @@ public class CrawlController {
      * 新增爬虫源
      * */
     @PostMapping("addCrawlSource")
-    public ResultBean addCrawlSource(CrawlSource source){
+    public ResultBean<Void> addCrawlSource(CrawlSource source){
         crawlService.addCrawlSource(source);
 
         return ResultBean.ok();
@@ -39,18 +33,17 @@ public class CrawlController {
     /**
      * 爬虫源分页列表查询
      * */
-    @PostMapping("listCrawlByPage")
-    public ResultBean listCrawlByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
+    @GetMapping("listCrawlByPage")
+    public ResultBean<PageBean<CrawlSource>> listCrawlByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
 
-        return ResultBean.ok(new PageInfo<>(BeanUtil.copyList(crawlService.listCrawlByPage(page,pageSize), CrawlSourceVO.class)
-                 ));
+        return ResultBean.ok(crawlService.listCrawlByPage(page,pageSize));
     }
 
     /**
      * 开启或停止爬虫
      * */
     @PostMapping("openOrCloseCrawl")
-    public ResultBean openOrCloseCrawl(Integer sourceId,Byte sourceStatus){
+    public ResultBean<Void> openOrCloseCrawl(Integer sourceId,Byte sourceStatus){
 
         crawlService.openOrCloseCrawl(sourceId,sourceStatus);
 
@@ -61,7 +54,7 @@ public class CrawlController {
      * 新增单本采集任务
      * */
     @PostMapping("addCrawlSingleTask")
-    public ResultBean addCrawlSingleTask(CrawlSingleTask singleTask){
+    public ResultBean<Void> addCrawlSingleTask(CrawlSingleTask singleTask){
         crawlService.addCrawlSingleTask(singleTask);
 
         return ResultBean.ok();
@@ -71,18 +64,17 @@ public class CrawlController {
     /**
      * 单本采集任务分页列表查询
      * */
-    @PostMapping("listCrawlSingleTaskByPage")
-    public ResultBean listCrawlSingleTaskByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
+    @GetMapping("listCrawlSingleTaskByPage")
+    public ResultBean<PageBean<CrawlSingleTask>> listCrawlSingleTaskByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
 
-        return ResultBean.ok(new PageInfo<>(BeanUtil.copyList(crawlService.listCrawlSingleTaskByPage(page,pageSize), CrawlSingleTaskVO.class)
-        ));
+        return ResultBean.ok(crawlService.listCrawlSingleTaskByPage(page,pageSize));
     }
 
     /**
      * 删除采集任务
      * */
-    @PostMapping("delCrawlSingleTask")
-    public ResultBean delCrawlSingleTask(Long id){
+    @DeleteMapping("delCrawlSingleTask/{id}")
+    public ResultBean<Void> delCrawlSingleTask(@PathVariable("id") Long id){
 
         crawlService.delCrawlSingleTask(id);
 

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

@@ -1,18 +1,11 @@
 package com.java2nb.novel.controller;
 
-import com.java2nb.novel.entity.Book;
-import com.java2nb.novel.entity.BookContent;
-import com.java2nb.novel.entity.BookIndex;
-import com.java2nb.novel.entity.News;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import java.util.List;
-
 /**
  * @author 11797
  */

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/ChapterBean.java

@@ -0,0 +1,25 @@
+package com.java2nb.novel.core.crawl;
+
+import com.java2nb.novel.entity.BookContent;
+import com.java2nb.novel.entity.BookIndex;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 章节数据封装bean
+ * @author Administrator
+ */
+@Data
+public class ChapterBean {
+
+    /**
+     * 章节索引集合
+     * */
+    List<BookIndex> bookIndexList;
+
+    /**
+     * 章节内容集合
+     * */
+    List<BookContent> bookContentList;
+}

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlBookChapterHandler.java

@@ -0,0 +1,12 @@
+package com.java2nb.novel.core.crawl;
+
+import com.java2nb.novel.entity.Book;
+
+/**
+ * 爬虫小说章节内容处理器
+ * */
+public interface CrawlBookChapterHandler {
+
+    void handle(ChapterBean chapterBean);
+
+}

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlBookHandler.java

@@ -0,0 +1,12 @@
+package com.java2nb.novel.core.crawl;
+
+import com.java2nb.novel.entity.Book;
+
+/**
+ * 爬虫小说处理器
+ * */
+public interface CrawlBookHandler {
+
+    void handle(Book book);
+
+}

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java

@@ -1,9 +1,6 @@
 package com.java2nb.novel.core.crawl;
 
-import com.java2nb.novel.core.utils.HttpUtil;
-import com.java2nb.novel.core.utils.IdWorker;
-import com.java2nb.novel.core.utils.RandomBookInfoUtil;
-import com.java2nb.novel.core.utils.RestTemplateUtil;
+import com.java2nb.novel.core.utils.*;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookContent;
 import com.java2nb.novel.entity.BookIndex;
@@ -11,8 +8,7 @@ import com.java2nb.novel.utils.Constants;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 
 import java.text.SimpleDateFormat;
@@ -30,21 +26,17 @@ import static java.util.regex.Pattern.compile;
 @Slf4j
 public class CrawlParser {
 
-    private static IdWorker idWorker = new IdWorker();
+    private static final IdWorker idWorker = new IdWorker();
 
-    public static final Integer BOOK_INDEX_LIST_KEY = 1;
+    private static final RestTemplate restTemplate = RestTemplateUtil.getInstance("utf-8");
 
-    public static final Integer BOOK_CONTENT_LIST_KEY = 2;
-
-    private static RestTemplate restTemplate = RestTemplateUtil.getInstance("utf-8");
-
-    private static ThreadLocal <Integer> retryCount = new ThreadLocal<>();
+    private static final ThreadLocal<Integer> retryCount = new ThreadLocal<>();
 
     @SneakyThrows
-    public static Book parseBook(RuleBean ruleBean, String bookId) {
+    public static void parseBook(RuleBean ruleBean, String bookId, CrawlBookHandler handler) {
         Book book = new Book();
         String bookDetailUrl = ruleBean.getBookDetailUrl().replace("{bookId}", bookId);
-        String bookDetailHtml = getByHttpClient(bookDetailUrl);
+        String bookDetailHtml = getByHttpClientWithChrome(bookDetailUrl);
         if (bookDetailHtml != null) {
             Pattern bookNamePatten = compile(ruleBean.getBookNamePatten());
             Matcher bookNameMatch = bookNamePatten.matcher(bookDetailHtml);
@@ -66,7 +58,7 @@ public class CrawlParser {
                         boolean isFindPicUrl = picUrlMatch.find();
                         if (isFindPicUrl) {
                             String picUrl = picUrlMatch.group(1);
-                            if(StringUtils.isNotBlank(picUrl) && StringUtils.isNotBlank(ruleBean.getPicUrlPrefix())) {
+                            if (StringUtils.isNotBlank(picUrl) && StringUtils.isNotBlank(ruleBean.getPicUrlPrefix())) {
                                 picUrl = ruleBean.getPicUrlPrefix() + picUrl;
                             }
                             //设置封面图片路径
@@ -97,11 +89,11 @@ public class CrawlParser {
                     String desc = bookDetailHtml.substring(bookDetailHtml.indexOf(ruleBean.getDescStart()) + ruleBean.getDescStart().length());
                     desc = desc.substring(0, desc.indexOf(ruleBean.getDescEnd()));
                     //过滤掉简介中的特殊标签
-                    desc = desc.replaceAll("<a[^<]+</a>","")
-                            .replaceAll("<font[^<]+</font>","")
-                            .replaceAll("<p>\\s*</p>","")
-                            .replaceAll("<p>","")
-                            .replaceAll("</p>","<br/>");
+                    desc = desc.replaceAll("<a[^<]+</a>", "")
+                            .replaceAll("<font[^<]+</font>", "")
+                            .replaceAll("<p>\\s*</p>", "")
+                            .replaceAll("<p>", "")
+                            .replaceAll("</p>", "<br/>");
                     //设置书籍简介
                     book.setBookDesc(desc);
                     if (StringUtils.isNotBlank(ruleBean.getStatusPatten())) {
@@ -143,13 +135,10 @@ public class CrawlParser {
                 }
             }
         }
-        return book;
+        handler.handle(book);
     }
 
-    public static Map<Integer, List> parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean, Map<Integer, BookIndex> hasIndexs) {
-        Map<Integer,List> result = new HashMap<>(2);
-        result.put(BOOK_INDEX_LIST_KEY,new ArrayList(0));
-        result.put(BOOK_CONTENT_LIST_KEY,new ArrayList(0));
+    public static void parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean, Map<Integer, BookIndex> existBookIndexMap, CrawlBookChapterHandler handler) {
 
         Date currentDate = new Date();
 
@@ -157,10 +146,10 @@ public class CrawlParser {
         List<BookContent> contentList = new ArrayList<>();
         //读取目录
         String indexListUrl = ruleBean.getBookIndexUrl().replace("{bookId}", sourceBookId);
-        String indexListHtml = getByHttpClient(indexListUrl);
+        String indexListHtml = getByHttpClientWithChrome(indexListUrl);
 
         if (indexListHtml != null) {
-            if(StringUtils.isNotBlank(ruleBean.getBookIndexStart())){
+            if (StringUtils.isNotBlank(ruleBean.getBookIndexStart())) {
                 indexListHtml = indexListHtml.substring(indexListHtml.indexOf(ruleBean.getBookIndexStart()) + ruleBean.getBookIndexStart().length());
             }
 
@@ -175,70 +164,86 @@ public class CrawlParser {
             int indexNum = 0;
 
             //总字数
-            Integer totalWordCount = 0;
-            //最新目录
-            Long lastIndexId = null;
-            String lastIndexName = null;
+            int totalWordCount = book.getWordCount() == null ? 0 : book.getWordCount();
 
             while (isFindIndex) {
 
-                BookIndex hasIndex = hasIndexs.get(indexNum);
+                BookIndex hasIndex = existBookIndexMap.get(indexNum);
                 String indexName = indexNameMatch.group(1);
 
                 if (hasIndex == null || !StringUtils.deleteWhitespace(hasIndex.getIndexName()).equals(StringUtils.deleteWhitespace(indexName))) {
-                    String contentUrl = ruleBean.getBookContentUrl().replace("{bookId}", sourceBookId).replace("{indexId}", indexIdMatch.group(1));
+
+                    String sourceIndexId = indexIdMatch.group(1);
+                    String bookContentUrl = ruleBean.getBookContentUrl();
+                    int calStart = bookContentUrl.indexOf("{cal_");
+                    if (calStart != -1) {
+                        //内容页URL需要进行计算才能得到
+                        String calStr = bookContentUrl.substring(calStart, calStart + bookContentUrl.substring(calStart).indexOf("}"));
+                        String[] calArr = calStr.split("_");
+                        int calType = Integer.parseInt(calArr[1]);
+                        if (calType == 1) {
+                            ///{cal_1_1_3}_{bookId}/{indexId}.html
+                            //第一种计算规则，去除第x个参数的最后y个字母
+                            int x = Integer.parseInt(calArr[2]);
+                            int y = Integer.parseInt(calArr[3]);
+                            String calResult;
+                            if (x == 1) {
+                                calResult = sourceBookId.substring(0, sourceBookId.length() - y);
+                            } else {
+                                calResult = sourceIndexId.substring(0, sourceBookId.length() - y);
+                            }
+
+                            if (calResult.length() == 0) {
+                                calResult = "0";
+
+                            }
+
+                            bookContentUrl = bookContentUrl.replace(calStr + "}", calResult);
+                        }
+
+                    }
+
+                    String contentUrl = bookContentUrl.replace("{bookId}", sourceBookId).replace("{indexId}", sourceIndexId);
 
                     //查询章节内容
-                    String contentHtml = getByHttpClient(contentUrl);
+                    String contentHtml = getByHttpClientWithChrome(contentUrl);
                     if (contentHtml != null && !contentHtml.contains("正在手打中")) {
                         String content = contentHtml.substring(contentHtml.indexOf(ruleBean.getContentStart()) + ruleBean.getContentStart().length());
                         content = content.substring(0, content.indexOf(ruleBean.getContentEnd()));
-                        //TODO插入章节目录和章节内容
+                        //插入章节目录和章节内容
                         BookIndex bookIndex = new BookIndex();
-
                         bookIndex.setIndexName(indexName);
                         bookIndex.setIndexNum(indexNum);
+                        int wordCount = StringUtil.getStrValidWordCount(content);
+                        bookIndex.setWordCount(wordCount);
                         indexList.add(bookIndex);
-                        BookContent bookContent = new BookContent();
 
+                        BookContent bookContent = new BookContent();
                         bookContent.setContent(content);
                         contentList.add(bookContent);
 
-                        //判断是新增还是更新
-                        if(hasIndexs.size() == 0){
-                            //新书入库
+                        if (hasIndex != null) {
+                            //章节更新
+                            bookIndex.setId(hasIndex.getId());
+                            bookContent.setIndexId(hasIndex.getId());
+
+                            //计算总字数
+                            totalWordCount = (totalWordCount + wordCount - hasIndex.getWordCount());
+                        } else {
+                            //章节插入
                             //设置目录和章节内容
                             Long indexId = idWorker.nextId();
-                            lastIndexId = indexId;
-                            lastIndexName = indexName;
                             bookIndex.setId(indexId);
                             bookIndex.setBookId(book.getId());
-                            Integer wordCount = bookContent.getContent().length();
-                            totalWordCount += wordCount;
-                            bookIndex.setWordCount(wordCount);
+
                             bookIndex.setCreateTime(currentDate);
-                            bookIndex.setUpdateTime(currentDate);
 
                             bookContent.setIndexId(indexId);
 
-                            //设置小说基础信息
-                            book.setWordCount(totalWordCount);
-                            book.setLastIndexId(lastIndexId);
-                            book.setLastIndexName(lastIndexName);
-                            book.setLastIndexUpdateTime(currentDate);
-                            book.setCreateTime(currentDate);
-                            book.setUpdateTime(currentDate);
-
-                        }else{
-                            //老书更新
-                        }
-
-
-
-                        if(hasIndex != null){
-                            bookIndex.setId(hasIndex.getId());
-                            bookContent.setIndexId(hasIndex.getId());
+                            //计算总字数
+                            totalWordCount += wordCount;
                         }
+                        bookIndex.setUpdateTime(currentDate);
 
 
                     }
@@ -249,16 +254,37 @@ public class CrawlParser {
                 isFindIndex = indexIdMatch.find() & indexNameMatch.find();
             }
 
+
+            if (indexList.size() > 0) {
+                //如果有爬到最新章节，则设置小说主表的最新章节信息
+                //获取爬取到的最新章节
+                BookIndex lastIndex = indexList.get(indexList.size() - 1);
+                book.setLastIndexId(lastIndex.getId());
+                book.setLastIndexName(lastIndex.getIndexName());
+                book.setLastIndexUpdateTime(currentDate);
+
+            }
+            book.setWordCount(totalWordCount);
+            book.setUpdateTime(currentDate);
+
             if (indexList.size() == contentList.size() && indexList.size() > 0) {
 
-                result.put(BOOK_INDEX_LIST_KEY,indexList);
-                result.put(BOOK_CONTENT_LIST_KEY,contentList);
+                handler.handle(new ChapterBean() {{
+                    setBookIndexList(indexList);
+                    setBookContentList(contentList);
+                }});
+
+                return;
 
             }
 
         }
 
-        return result;
+        handler.handle(new ChapterBean() {{
+            setBookIndexList(new ArrayList<>(0));
+            setBookContentList(new ArrayList<>(0));
+        }});
+
     }
 
 
@@ -267,7 +293,8 @@ public class CrawlParser {
             ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
             if (forEntity.getStatusCode() == HttpStatus.OK) {
                 String body = forEntity.getBody();
-                if(body.length() < Constants.INVALID_HTML_LENGTH){
+                assert body != null;
+                if (body.length() < Constants.INVALID_HTML_LENGTH) {
                     return processErrorHttpResult(url);
                 }
                 //成功获得html内容
@@ -280,14 +307,30 @@ public class CrawlParser {
 
     }
 
+    private static String getByHttpClientWithChrome(String url) {
+        try {
+
+            String body = HttpUtil.getByHttpClientWithChrome(url);
+            if (body != null && body.length() < Constants.INVALID_HTML_LENGTH) {
+                return processErrorHttpResult(url);
+            }
+            //成功获得html内容
+            return body;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return processErrorHttpResult(url);
+
+    }
+
     @SneakyThrows
-    private static String processErrorHttpResult(String url){
+    private static String processErrorHttpResult(String url) {
         Integer count = retryCount.get();
-        if(count == null){
+        if (count == null) {
             count = 0;
         }
-        if(count < Constants.HTTP_FAIL_RETRY_COUNT){
-            Thread.sleep(  new Random().nextInt(10*1000));
+        if (count < Constants.HTTP_FAIL_RETRY_COUNT) {
+            Thread.sleep(new Random().nextInt(10 * 1000));
             retryCount.set(++count);
             return getByHttpClient(url);
         }

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/RuleBean.java

@@ -35,7 +35,7 @@ public class RuleBean {
     private String statusPatten;
     private String scorePatten;
     private String visitCountPatten;
-    private String descStart;;
+    private String descStart;
     private String descEnd;
     private String upadateTimePatten;
     private String upadateTimeFormatPatten;

novel-crawl/src/main/java/com/java2nb/novel/core/listener/StarterListener.java

@@ -1,6 +1,7 @@
 package com.java2nb.novel.core.listener;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.java2nb.novel.core.crawl.ChapterBean;
 import com.java2nb.novel.core.crawl.CrawlParser;
 import com.java2nb.novel.core.crawl.RuleBean;
 import com.java2nb.novel.entity.*;
@@ -16,9 +17,9 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Administrator
@@ -55,25 +56,28 @@ public class StarterListener implements ServletContextListener {
                                 CrawlSource source = crawlService.queryCrawlSource(needUpdateBook.getCrawlSourceId());
                                 RuleBean ruleBean = new ObjectMapper().readValue(source.getCrawlRule(), RuleBean.class);
                                 //解析小说基本信息
-                                Book book = CrawlParser.parseBook(ruleBean, needUpdateBook.getCrawlBookId());
-                                //这里只做老书更新
-                                book.setId(needUpdateBook.getId());
-                                if (needUpdateBook.getPicUrl() != null && needUpdateBook.getPicUrl().contains(Constants.LOCAL_PIC_PREFIX)) {
-                                    //本地图片则不更新
-                                    book.setPicUrl(null);
-                                }
-                                //查询已存在的章节
-                                Map<Integer, BookIndex> existBookIndexMap = bookService.queryExistBookIndexMap(needUpdateBook.getId());
-                                //解析章节目录
-                                Map<Integer, List> indexAndContentList = CrawlParser.parseBookIndexAndContent(needUpdateBook.getCrawlBookId(), book, ruleBean, existBookIndexMap);
-                                bookService.updateBookAndIndexAndContent(book, (List<BookIndex>) indexAndContentList.get(CrawlParser.BOOK_INDEX_LIST_KEY), (List<BookContent>) indexAndContentList.get(CrawlParser.BOOK_CONTENT_LIST_KEY), existBookIndexMap);
+                                CrawlParser.parseBook(ruleBean, needUpdateBook.getCrawlBookId(),book -> {
+                                    //这里只做老书更新
+                                    book.setId(needUpdateBook.getId());
+                                    book.setWordCount(needUpdateBook.getWordCount());
+                                    if (needUpdateBook.getPicUrl() != null && needUpdateBook.getPicUrl().contains(Constants.LOCAL_PIC_PREFIX)) {
+                                        //本地图片则不更新
+                                        book.setPicUrl(null);
+                                    }
+                                    //查询已存在的章节
+                                    Map<Integer, BookIndex> existBookIndexMap = bookService.queryExistBookIndexMap(needUpdateBook.getId());
+                                    //解析章节目录
+                                    CrawlParser.parseBookIndexAndContent(needUpdateBook.getCrawlBookId(), book, ruleBean, existBookIndexMap,chapter -> {
+                                        bookService.updateBookAndIndexAndContent(book, chapter.getBookIndexList(), chapter.getBookContentList(), existBookIndexMap);
+                                    });
+                                });
                             } catch (Exception e) {
                                 log.error(e.getMessage(), e);
                             }
 
                         }
-
-                        Thread.sleep(1000 * 60 * 10);
+                        //  休眠10分钟
+                        TimeUnit.MINUTES.sleep(10);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
                     }
@@ -106,7 +110,8 @@ public class StarterListener implements ServletContextListener {
 
                     }
 
-                    Thread.sleep(1000 * 60);
+                    //休眠1分钟
+                    TimeUnit.MINUTES.sleep(1);
 
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);

novel-crawl/src/main/java/com/java2nb/novel/core/schedule/CrawlThreadMonitor.java

@@ -8,12 +8,10 @@ import com.java2nb.novel.entity.CrawlSource;
 import com.java2nb.novel.service.CrawlService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**

novel-crawl/src/main/java/com/java2nb/novel/service/BookContentService.java

@@ -0,0 +1,16 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.entity.BookContent;
+
+import java.util.List;
+
+public interface BookContentService {
+
+    void saveBookContent(List<BookContent> bookContentList,Long bookId);
+
+    void saveBookContent(BookContent bookContent,Long bookId);
+
+    void updateBookContent(BookContent bookContent,Long bookId);
+
+
+}

novel-crawl/src/main/java/com/java2nb/novel/service/BookService.java

@@ -65,14 +65,14 @@ public interface BookService {
      * @param book 小说数据
      * @param bookIndexList 目录集合
      * @param bookContentList 内容集合
-     * @param existBookIndexMap  已存在的章节Map
-     * */
-    void updateBookAndIndexAndContent(Book book, List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap);
+     * @param existBookIndexMap  已存在的章节Map   */
+    void updateBookAndIndexAndContent(Book book,  List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap);
 
     /**
      * 更新一下最后一次的抓取时间
      * @param bookId 小说ID
      * */
+    @Deprecated
     void updateCrawlLastTime(Long bookId);
 
     /**

novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java

@@ -1,5 +1,6 @@
 package com.java2nb.novel.service;
 
+import com.java2nb.novel.core.bean.PageBean;
 import com.java2nb.novel.core.crawl.RuleBean;
 import com.java2nb.novel.entity.CrawlSingleTask;
 import com.java2nb.novel.entity.CrawlSource;
@@ -22,9 +23,9 @@ public interface CrawlService {
      * 爬虫源分页列表
      * @param page 当前页码
      * @param pageSize 分页大小
-     *@return 爬虫源集合
+     *@return 爬虫源分页数据
      * */
-    List<CrawlSource> listCrawlByPage(int page, int pageSize);
+    PageBean<CrawlSource> listCrawlByPage(int page, int pageSize);
 
     /**
      * 开启或停止爬虫
@@ -61,7 +62,7 @@ public interface CrawlService {
      * 根据分类ID和规则解析分类列表
      * @param catId 分类ID
      * @param ruleBean 规则对象
-     * @param sourceId
+     * @param sourceId 爬虫源ID
      */
     void parseBookList(int catId, RuleBean ruleBean, Integer sourceId);
 
@@ -83,9 +84,9 @@ public interface CrawlService {
      * 单本采集任务分页列表查询
      * @param page 当前页码
      * @param pageSize 分页大小
-     * @return 单本采集任务集合
+     * @return 单本采集任务分页数据
      * */
-    List<CrawlSingleTask> listCrawlSingleTaskByPage(int page, int pageSize);
+    PageBean<CrawlSingleTask> listCrawlSingleTaskByPage(int page, int pageSize);
 
     /**
      * 删除采集任务

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

@@ -1,10 +1,10 @@
 package com.java2nb.novel.service.impl;
 
-import com.java2nb.novel.core.utils.IdWorker;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookContent;
 import com.java2nb.novel.entity.BookIndex;
 import com.java2nb.novel.mapper.*;
+import com.java2nb.novel.service.BookContentService;
 import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.utils.Constants;
 import lombok.RequiredArgsConstructor;
@@ -38,7 +38,7 @@ public class BookServiceImpl implements BookService {
 
     private final CrawlBookIndexMapper bookIndexMapper;
 
-    private final BookContentMapper bookContentMapper;
+    private final BookContentService bookContentService;
 
 
     @Override
@@ -47,7 +47,7 @@ public class BookServiceImpl implements BookService {
         return bookMapper.count(countFrom(BookDynamicSqlSupport.book).where(BookDynamicSqlSupport.bookName, isEqualTo(bookName))
                 .and(BookDynamicSqlSupport.authorName, isEqualTo(authorName))
                 .build()
-                .render(RenderingStrategies.MYBATIS3))>0;
+                .render(RenderingStrategies.MYBATIS3)) > 0;
 
     }
 
@@ -58,7 +58,7 @@ public class BookServiceImpl implements BookService {
                 .equalTo(sourceId)
                 .set(crawlBookId)
                 .equalTo(bookId)
-                .where(BookDynamicSqlSupport.id,isEqualTo(id))
+                .where(BookDynamicSqlSupport.id, isEqualTo(id))
                 .build()
                 .render(RenderingStrategies.MYBATIS3));
     }
@@ -75,21 +75,18 @@ public class BookServiceImpl implements BookService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void saveBookAndIndexAndContent(Book book, List<BookIndex> bookIndexList, List<BookContent> bookContentList) {
-        if(!queryIsExistByBookNameAndAuthorName(book.getBookName(),book.getAuthorName())) {
+        if (!queryIsExistByBookNameAndAuthorName(book.getBookName(), book.getAuthorName())) {
 
-            if(bookIndexList.size()>0) {
-
-                if (book.getId() == null) {
-                    book.setId(new IdWorker().nextId());
-                }
+            if (bookIndexList.size() > 0) {
 
                 //保存小说主表
 
+                book.setCreateTime(new Date());
                 bookMapper.insertSelective(book);
 
                 //批量保存目录和内容
                 bookIndexMapper.insertMultiple(bookIndexList);
-                bookContentMapper.insertMultiple(bookContentList);
+                bookContentService.saveBookContent(bookContentList,book.getId());
 
             }
         }
@@ -100,7 +97,7 @@ public class BookServiceImpl implements BookService {
     @Override
     public List<Book> queryNeedUpdateBook(Date startDate, int limit) {
         List<Book> books = bookMapper.queryNeedUpdateBook(startDate, limit);
-        if(books.size()>0) {
+        if (books.size() > 0) {
             //更新最后抓取时间为当前时间
             bookMapper.updateCrawlLastTime(books, new Date());
         }
@@ -109,13 +106,13 @@ public class BookServiceImpl implements BookService {
 
     @Override
     public Map<Integer, BookIndex> queryExistBookIndexMap(Long bookId) {
-        List<BookIndex> bookIndexs = bookIndexMapper.selectMany(select(BookIndexDynamicSqlSupport.id,BookIndexDynamicSqlSupport.indexNum,BookIndexDynamicSqlSupport.indexName)
+        List<BookIndex> bookIndexs = bookIndexMapper.selectMany(select(BookIndexDynamicSqlSupport.id, BookIndexDynamicSqlSupport.indexNum, BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.wordCount)
                 .from(BookIndexDynamicSqlSupport.bookIndex)
-                .where(BookIndexDynamicSqlSupport.bookId,isEqualTo(bookId))
+                .where(BookIndexDynamicSqlSupport.bookId, isEqualTo(bookId))
                 .build()
                 .render(RenderingStrategies.MYBATIS3));
         if (bookIndexs.size() > 0) {
-            return  bookIndexs.stream().collect(Collectors.toMap(BookIndex::getIndexNum, Function.identity()));
+            return bookIndexs.stream().collect(Collectors.toMap(BookIndex::getIndexNum, Function.identity()));
         }
         return new HashMap<>(0);
     }
@@ -123,61 +120,28 @@ public class BookServiceImpl implements BookService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateBookAndIndexAndContent(Book book, List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap) {
-        Date currentDate = new Date();
         for (int i = 0; i < bookIndexList.size(); i++) {
             BookIndex bookIndex = bookIndexList.get(i);
             BookContent bookContent = bookContentList.get(i);
 
-            //插入或更新目录
-            Integer wordCount = bookContent.getContent().length();
-            bookIndex.setWordCount(wordCount);
-            bookIndex.setUpdateTime(currentDate);
 
-            if(bookIndex.getId() == null) {
+            if (!existBookIndexMap.containsKey(bookIndex.getIndexNum())) {
                 //插入
-                bookIndex.setBookId(book.getId());
-                Long indexId = new IdWorker().nextId();
-                bookIndex.setId(indexId);
-                bookIndex.setCreateTime(currentDate);
                 bookIndexMapper.insertSelective(bookIndex);
-            }else{
+                bookContentService.saveBookContent(bookContent,book.getId());
+            } else {
                 //更新
                 bookIndexMapper.updateByPrimaryKeySelective(bookIndex);
+                bookContentService.updateBookContent(bookContent,book.getId());
             }
 
-            if(bookContent.getIndexId() == null) {
-                //插入
-                bookContent.setIndexId(bookIndex.getId());
-                bookContentMapper.insertSelective(bookContent);
-            }else{
-                //更新
-
-                bookContentMapper.update(update(BookContentDynamicSqlSupport.bookContent)
-                        .set(BookContentDynamicSqlSupport.content)
-                        .equalTo(bookContent.getContent())
-                        .where(BookContentDynamicSqlSupport.indexId,isEqualTo(bookContent.getIndexId()))
-                        .build()
-                        .render(RenderingStrategies.MYBATIS3));
-            }
 
         }
 
         //更新小说主表
-        if(bookIndexList.size()>0) {
-            //有更新章节，才需要更新以下字段
-            book.setWordCount(queryTotalWordCount(book.getId()));
-            BookIndex lastIndex = bookIndexList.get(bookIndexList.size()-1);
-            if(!existBookIndexMap.containsKey(lastIndex.getIndexNum())) {
-                //如果最新章节不在已存在章节中，那么更新小说表最新章节信息
-                book.setLastIndexId(lastIndex.getId());
-                book.setLastIndexName(lastIndex.getIndexName());
-                book.setLastIndexUpdateTime(currentDate);
-            }
-        }
-        book.setUpdateTime(currentDate);
         book.setBookName(null);
         book.setAuthorName(null);
-        if(Constants.VISIT_COUNT_DEFAULT.equals(book.getVisitCount())) {
+        if (Constants.VISIT_COUNT_DEFAULT.equals(book.getVisitCount())) {
             book.setVisitCount(null);
         }
         bookMapper.updateByPrimaryKeySelective(book);
@@ -200,7 +164,7 @@ public class BookServiceImpl implements BookService {
                 .build()
                 .render(RenderingStrategies.MYBATIS3));
 
-        if(books.size()>0){
+        if (books.size() > 0) {
             return books.get(0);
         }
 
@@ -208,19 +172,4 @@ public class BookServiceImpl implements BookService {
 
     }
 
-    /**
-     * 查询最后的章节
-     * */
-    private BookIndex queryLastIndex(Long bookId) {
-        return bookIndexMapper.queryLastIndex(bookId);
-    }
-
-    /**
-     * 查询小说总字数
-     * */
-    private Integer queryTotalWordCount(Long bookId) {
-
-        return bookMapper.queryTotalWordCount(bookId);
-
-    }
 }

novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java

@@ -2,20 +2,28 @@ package com.java2nb.novel.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
+import com.java2nb.novel.core.bean.PageBean;
 import com.java2nb.novel.core.cache.CacheKey;
 import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.core.crawl.CrawlParser;
 import com.java2nb.novel.core.crawl.RuleBean;
 import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.exception.BusinessException;
+import com.java2nb.novel.core.utils.BeanUtil;
 import com.java2nb.novel.core.utils.IdWorker;
 import com.java2nb.novel.core.utils.SpringUtil;
 import com.java2nb.novel.core.utils.ThreadUtil;
-import com.java2nb.novel.entity.*;
+import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.entity.CrawlSingleTask;
 import com.java2nb.novel.entity.CrawlSource;
-import com.java2nb.novel.mapper.*;
+import com.java2nb.novel.mapper.CrawlSingleTaskDynamicSqlSupport;
+import com.java2nb.novel.mapper.CrawlSingleTaskMapper;
+import com.java2nb.novel.mapper.CrawlSourceDynamicSqlSupport;
+import com.java2nb.novel.mapper.CrawlSourceMapper;
 import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.service.CrawlService;
+import com.java2nb.novel.vo.CrawlSingleTaskVO;
+import com.java2nb.novel.vo.CrawlSourceVO;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -23,17 +31,15 @@ import org.apache.commons.lang3.StringUtils;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.java2nb.novel.core.utils.HttpUtil.getByHttpClient;
-import static com.java2nb.novel.mapper.BookDynamicSqlSupport.crawlBookId;
-import static com.java2nb.novel.mapper.BookDynamicSqlSupport.crawlSourceId;
+import static com.java2nb.novel.core.utils.HttpUtil.getByHttpClientWithChrome;
 import static com.java2nb.novel.mapper.CrawlSourceDynamicSqlSupport.*;
-import static org.mybatis.dynamic.sql.SqlBuilder.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
 import static org.mybatis.dynamic.sql.select.SelectDSL.select;
 
 /**
@@ -65,14 +71,17 @@ public class CrawlServiceImpl implements CrawlService {
     }
 
     @Override
-    public List<CrawlSource> listCrawlByPage(int page, int pageSize) {
+    public PageBean<CrawlSource> listCrawlByPage(int page, int pageSize) {
         PageHelper.startPage(page, pageSize);
         SelectStatementProvider render = select(id, sourceName, sourceStatus, createTime, updateTime)
                 .from(crawlSource)
                 .orderBy(updateTime)
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
-        return crawlSourceMapper.selectMany(render);
+        List<CrawlSource> crawlSources = crawlSourceMapper.selectMany(render);
+        PageBean<CrawlSource> pageBean = new PageBean<>(crawlSources);
+        pageBean.setList(BeanUtil.copyList(crawlSources, CrawlSourceVO.class));
+        return pageBean;
     }
 
     @SneakyThrows
@@ -111,11 +120,7 @@ public class CrawlServiceImpl implements CrawlService {
                 //按分类开始爬虫解析任务
                 for (int i = 1; i < 8; i++) {
                     final int catId = i;
-                    Thread thread = new Thread(() -> {
-
-                        parseBookList(catId, ruleBean, sourceId);
-
-                    });
+                    Thread thread = new Thread(() -> CrawlServiceImpl.this.parseBookList(catId, ruleBean, sourceId));
                     thread.start();
                     //thread加入到监控缓存中
                     threadIds.add(thread.getId());
@@ -155,14 +160,17 @@ public class CrawlServiceImpl implements CrawlService {
     }
 
     @Override
-    public List<CrawlSingleTask> listCrawlSingleTaskByPage(int page, int pageSize) {
+    public PageBean<CrawlSingleTask> listCrawlSingleTaskByPage(int page, int pageSize) {
         PageHelper.startPage(page, pageSize);
         SelectStatementProvider render = select(CrawlSingleTaskDynamicSqlSupport.crawlSingleTask.allColumns())
                 .from(CrawlSingleTaskDynamicSqlSupport.crawlSingleTask)
                 .orderBy(CrawlSingleTaskDynamicSqlSupport.createTime.descending())
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
-        return crawlSingleTaskMapper.selectMany(render);
+        List<CrawlSingleTask> crawlSingleTasks = crawlSingleTaskMapper.selectMany(render);
+        PageBean<CrawlSingleTask> pageBean = new PageBean<>(crawlSingleTasks);
+        pageBean.setList(BeanUtil.copyList(crawlSingleTasks, CrawlSingleTaskVO.class));
+        return pageBean;
     }
 
     @Override
@@ -217,7 +225,7 @@ public class CrawlServiceImpl implements CrawlService {
                             .replace("{catId}", ruleBean.getCatIdRule().get("catId" + catId))
                             .replace("{page}", page + "");
 
-                    String bookListHtml = getByHttpClient(catBookListUrl);
+                    String bookListHtml = getByHttpClientWithChrome(catBookListUrl);
                     if (bookListHtml != null) {
                         Pattern bookIdPatten = Pattern.compile(ruleBean.getBookIdPatten());
                         Matcher bookIdMatcher = bookIdPatten.matcher(bookListHtml);
@@ -266,39 +274,46 @@ public class CrawlServiceImpl implements CrawlService {
 
     @Override
     public boolean parseBookAndSave(int catId, RuleBean ruleBean, Integer sourceId, String bookId) {
-        Book book = CrawlParser.parseBook(ruleBean, bookId);
-        if(book.getBookName() == null || book.getAuthorName() == null){
-            return false;
-        }
-        //这里只做新书入库，查询是否存在这本书
-        Book existBook = bookService.queryBookByBookNameAndAuthorName(book.getBookName(), book.getAuthorName());
-        //如果该小说不存在，则可以解析入库，但是标记该小说正在入库，30分钟之后才允许再次入库
-        if (existBook == null) {
-            //没有该书，可以入库
-            book.setCatId(catId);
-            //根据分类ID查询分类
-            book.setCatName(bookService.queryCatNameByCatId(catId));
-            if (catId == 7) {
-                //女频
-                book.setWorkDirection((byte) 1);
-            } else {
-                //男频
-                book.setWorkDirection((byte) 0);
+
+        final AtomicBoolean parseResult = new AtomicBoolean(false);
+
+        CrawlParser.parseBook(ruleBean, bookId, book -> {
+            if(book.getBookName() == null || book.getAuthorName() == null){
+                return;
             }
-            book.setCrawlBookId(bookId);
-            book.setCrawlSourceId(sourceId);
-            book.setCrawlLastTime(new Date());
-            book.setId(new IdWorker().nextId());
-            //解析章节目录
-            Map<Integer, List> indexAndContentList = CrawlParser.parseBookIndexAndContent(bookId, book, ruleBean, new HashMap<>(0));
+            //这里只做新书入库，查询是否存在这本书
+            Book existBook = bookService.queryBookByBookNameAndAuthorName(book.getBookName(), book.getAuthorName());
+            //如果该小说不存在，则可以解析入库，但是标记该小说正在入库，30分钟之后才允许再次入库
+            if (existBook == null) {
+                //没有该书，可以入库
+                book.setCatId(catId);
+                //根据分类ID查询分类
+                book.setCatName(bookService.queryCatNameByCatId(catId));
+                if (catId == 7) {
+                    //女频
+                    book.setWorkDirection((byte) 1);
+                } else {
+                    //男频
+                    book.setWorkDirection((byte) 0);
+                }
+                book.setCrawlBookId(bookId);
+                book.setCrawlSourceId(sourceId);
+                book.setCrawlLastTime(new Date());
+                book.setId(new IdWorker().nextId());
+                //解析章节目录
+                CrawlParser.parseBookIndexAndContent(bookId, book, ruleBean, new HashMap<>(0),chapter -> {
+                    bookService.saveBookAndIndexAndContent(book, chapter.getBookIndexList(), chapter.getBookContentList());
+                });
 
-            bookService.saveBookAndIndexAndContent(book, (List<BookIndex>) indexAndContentList.get(CrawlParser.BOOK_INDEX_LIST_KEY), (List<BookContent>) indexAndContentList.get(CrawlParser.BOOK_CONTENT_LIST_KEY));
+            } else {
+                //只更新书籍的爬虫相关字段
+                bookService.updateCrawlProperties(existBook.getId(), sourceId, bookId);
+            }
+            parseResult.set(true);
+        });
+
+        return parseResult.get();
 
-        } else {
-            //只更新书籍的爬虫相关字段
-            bookService.updateCrawlProperties(existBook.getId(), sourceId, bookId);
-        }
-        return true;
     }
 
     @Override

novel-crawl/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java

@@ -0,0 +1,44 @@
+package com.java2nb.novel.service.impl;
+
+import com.java2nb.novel.entity.BookContent;
+import com.java2nb.novel.mapper.BookContentDynamicSqlSupport;
+import com.java2nb.novel.mapper.BookContentMapper;
+import com.java2nb.novel.service.BookContentService;
+import lombok.RequiredArgsConstructor;
+import org.mybatis.dynamic.sql.render.RenderingStrategies;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+import static org.mybatis.dynamic.sql.SqlBuilder.update;
+
+
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "txt.save", name = "storage", havingValue = "db")
+public class DbBookContentServiceImpl implements BookContentService {
+
+    private final BookContentMapper bookContentMapper;
+
+    @Override
+    public void saveBookContent(List<BookContent> bookContentList,Long bookId) {
+        bookContentMapper.insertMultiple(bookContentList);
+    }
+
+    @Override
+    public void saveBookContent(BookContent bookContent,Long bookId) {
+        bookContentMapper.insertSelective(bookContent);
+    }
+
+    @Override
+    public void updateBookContent(BookContent bookContent,Long bookId) {
+        bookContentMapper.update(update(BookContentDynamicSqlSupport.bookContent)
+                .set(BookContentDynamicSqlSupport.content)
+                .equalTo(bookContent.getContent())
+                .where(BookContentDynamicSqlSupport.indexId,isEqualTo(bookContent.getIndexId()))
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+    }
+}

novel-crawl/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java

@@ -0,0 +1,36 @@
+package com.java2nb.novel.service.impl;
+
+import com.java2nb.novel.core.utils.FileUtil;
+import com.java2nb.novel.entity.BookContent;
+import com.java2nb.novel.service.BookContentService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "txt.save", name = "storage", havingValue = "file")
+public class FileBookContentServiceImpl implements BookContentService {
+
+    @Value("${txt.save.path}")
+    private String fileSavePath;
+
+    @Override
+    public void saveBookContent(List<BookContent> bookContentList,Long bookId) {
+        bookContentList.forEach(bookContent -> saveBookContent(bookContent,bookId));
+
+    }
+
+    @Override
+    public void saveBookContent(BookContent bookContent,Long bookId) {
+        FileUtil.writeContentToFile(fileSavePath,"/"+bookId+"/"+bookContent.getIndexId()+".txt",bookContent.getContent());
+    }
+
+    @Override
+    public void updateBookContent(BookContent bookContent,Long bookId) {
+        FileUtil.writeContentToFile(fileSavePath,"/"+bookId+"/"+bookContent.getIndexId()+".txt",bookContent.getContent());
+    }
+}

novel-crawl/src/main/java/com/java2nb/novel/vo/CrawlSingleTaskVO.java

@@ -2,14 +2,15 @@ package com.java2nb.novel.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.java2nb.novel.entity.CrawlSingleTask;
-import com.java2nb.novel.entity.CrawlSource;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
 /**
  * @author Administrator
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class CrawlSingleTaskVO extends CrawlSingleTask {
 

novel-crawl/src/main/java/com/java2nb/novel/vo/CrawlSourceVO.java

@@ -3,13 +3,14 @@ package com.java2nb.novel.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.java2nb.novel.entity.CrawlSource;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import javax.annotation.Generated;
 import java.util.Date;
 
 /**
  * @author Administrator
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class CrawlSourceVO extends CrawlSource{
 

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

@@ -0,0 +1,3 @@
+spring:
+    profiles:
+        include: [common-prod]

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

@@ -1,6 +1,9 @@
 #端口号
 server:
   port: 8081
+  servlet:
+    session:
+      timeout: 1D
 
 spring:
   profiles:
@@ -19,3 +22,6 @@ crawl:
     thread: 1
 
 
+
+
+

novel-crawl/src/main/resources/mybatis/mapping/BookMapper.xml

@@ -5,7 +5,7 @@
 
     <select id="queryNeedUpdateBook" resultType="com.java2nb.novel.entity.Book">
 
-        select id,crawl_source_id,crawl_book_id,crawl_last_time,pic_url
+        select id,crawl_source_id,crawl_book_id,crawl_last_time,pic_url,word_count
         from book where last_index_update_time > #{startDate} and crawl_source_id is not null
         order by crawl_last_time
         limit ${limit}
@@ -15,8 +15,7 @@
 
     <select id="queryTotalWordCount" parameterType="long" resultType="int">
 
-        select sum(t2.word_count) from book t1 inner join book_index t2
-        on t1.id = t2.book_id and t1.id = #{bookId}
+        select sum(word_count) from book_index where book_id = #{bookId}
     </select>
 
     <update id="updateCrawlLastTime">

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

@@ -96,7 +96,7 @@
 <script language="javascript" type="text/javascript">
     $(function () {
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/crawl/listCrawlByPage",
             data: {'curr':1,'limit':100},
             dataType: "json",

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

@@ -125,7 +125,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/crawl/listCrawlSingleTaskByPage",
             data: {'curr': curr, 'limit': limit},
             dataType: "json",
@@ -205,9 +205,9 @@
     function del(id) {
 
         $.ajax({
-            type: "POST",
-            url: "/crawl/delCrawlSingleTask",
-            data: {'id': id},
+            type: "delete",
+            url: "/crawl/delCrawlSingleTask/"+id,
+            data: {},
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {

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

@@ -117,7 +117,7 @@
                                 示例：<b></b>
                                 <li><input type="text" id="visitCountPatten" class="s_input icon_key"
                                            placeholder="小说点击量的正则表达式："></li>
-                                示例：<b>&lt;p class=\"review\"&gt;</b>
+                                示例：<b>&lt;p class="review"&gt;</b>
                                 <li><input type="text" id="descStart" class="s_input icon_key"
                                            placeholder="小说简介开始截取字符串："></li>
                                 示例：<b>&lt;/p&gt;</b>