\"}', 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;
\ No newline at end of file
diff --git a/sql/sql文件说明.txt b/doc/sql/sql文件说明.txt
similarity index 100%
rename from sql/sql文件说明.txt
rename to doc/sql/sql文件说明.txt
diff --git a/novel-admin/pom.xml b/novel-admin/pom.xml
index c9f6e06..46d059c 100644
--- a/novel-admin/pom.xml
+++ b/novel-admin/pom.xml
@@ -5,7 +5,7 @@
com.java2nb
novel-admin
-
3.1.0
+
3.6.0
jar
novel-admin
diff --git a/novel-admin/src/main/java/com/java2nb/AdminApplication.java b/novel-admin/src/main/java/com/java2nb/AdminApplication.java
index 5eb633f..503fd06 100644
--- a/novel-admin/src/main/java/com/java2nb/AdminApplication.java
+++ b/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) {
diff --git a/novel-admin/src/main/java/com/java2nb/common/config/ShiroConfig.java b/novel-admin/src/main/java/com/java2nb/common/config/ShiroConfig.java
index bc2a8f7..20d344d 100644
--- a/novel-admin/src/main/java/com/java2nb/common/config/ShiroConfig.java
+++ b/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");
diff --git a/novel-admin/src/main/java/com/java2nb/novel/controller/StatController.java b/novel-admin/src/main/java/com/java2nb/novel/controller/StatController.java
index 3816599..689a213 100644
--- a/novel-admin/src/main/java/com/java2nb/novel/controller/StatController.java
+++ b/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;
diff --git a/novel-admin/src/main/java/com/java2nb/test/controller/OrderController.java b/novel-admin/src/main/java/com/java2nb/test/controller/OrderController.java
deleted file mode 100644
index bd8f376..0000000
--- a/novel-admin/src/main/java/com/java2nb/test/controller/OrderController.java
+++ /dev/null
@@ -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
params) {
- //查询列表数据
- Query query = new Query(params);
- List 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();
- }
-
-}
diff --git a/novel-admin/src/main/java/com/java2nb/test/dao/OrderDao.java b/novel-admin/src/main/java/com/java2nb/test/dao/OrderDao.java
deleted file mode 100644
index 8fe5d98..0000000
--- a/novel-admin/src/main/java/com/java2nb/test/dao/OrderDao.java
+++ /dev/null
@@ -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 list(Map map);
-
- int count(Map map);
-
- int save(OrderDO order);
-
- int update(OrderDO order);
-
- int remove(Long id);
-
- int batchRemove(Long[] ids);
-}
diff --git a/novel-admin/src/main/java/com/java2nb/test/domain/OrderDO.java b/novel-admin/src/main/java/com/java2nb/test/domain/OrderDO.java
deleted file mode 100644
index 5b44c96..0000000
--- a/novel-admin/src/main/java/com/java2nb/test/domain/OrderDO.java
+++ /dev/null
@@ -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;
- }
-}
diff --git a/novel-admin/src/main/java/com/java2nb/test/service/OrderService.java b/novel-admin/src/main/java/com/java2nb/test/service/OrderService.java
deleted file mode 100644
index 4f5914e..0000000
--- a/novel-admin/src/main/java/com/java2nb/test/service/OrderService.java
+++ /dev/null
@@ -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 list(Map map);
-
- int count(Map map);
-
- int save(OrderDO order);
-
- int update(OrderDO order);
-
- int remove(Long id);
-
- int batchRemove(Long[] ids);
-}
diff --git a/novel-admin/src/main/java/com/java2nb/test/service/impl/OrderServiceImpl.java b/novel-admin/src/main/java/com/java2nb/test/service/impl/OrderServiceImpl.java
deleted file mode 100644
index cefed83..0000000
--- a/novel-admin/src/main/java/com/java2nb/test/service/impl/OrderServiceImpl.java
+++ /dev/null
@@ -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 list(Map map){
- return orderDao.list(map);
- }
-
- @Override
- public int count(Map 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);
- }
-
-}
diff --git a/novel-admin/src/main/resources/application-dev.yml b/novel-admin/src/main/resources/application-dev.yml
index e02a464..efe02c5 100644
--- a/novel-admin/src/main/resources/application-dev.yml
+++ b/novel-admin/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
java2nb:
- uploadPath: c:/var/java2nb/uploaded_files/
+ uploadPath: /var/pic/
username: admin
password: 111111
logging:
@@ -13,6 +13,7 @@ spring:
url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: novel_plus
password: Aa123456
+
#password:
initialSize: 1
minIdle: 3
diff --git a/novel-admin/src/main/resources/application-prod.yml b/novel-admin/src/main/resources/application-prod.yml
index 64c02e7..5d8c090 100644
--- a/novel-admin/src/main/resources/application-prod.yml
+++ b/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
\ No newline at end of file
+ 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
\ No newline at end of file
diff --git a/novel-admin/src/main/resources/banner.txt b/novel-admin/src/main/resources/banner.txt
index 8e9bd6d..9b09382 100644
--- a/novel-admin/src/main/resources/banner.txt
+++ b/novel-admin/src/main/resources/banner.txt
@@ -1,6 +1,15 @@
- __ ________ ___.
- |__|____ ___ _______ \_____ \ ____\_ |__
- | \__ \\ \/ /\__ \ / ____/ / \| __ \
- | |/ __ \\ / / __ \_/ \| | \ \_\ \
-/\__| (____ /\_/ (____ /\_______ \___| /___ /
-\______| \/ \/ \/ \/ \/
\ No newline at end of file
+${AnsiColor.CYAN}
+
+--------------------------------------------------------------------------------
+${AnsiColor.RED}
+|| / | / /
+|| / | / / ___ // ___ ___ _ __
+|| / /||/ / //___) ) // // ) ) // ) ) // ) ) ) )
+||/ / | / // // // // / / // / / / /
+| / | / ((____ // ((____ ((___/ / // / / / / 小说精品屋欢迎您！！！
+
+ -------Powered By XXY
+${AnsiColor.CYAN}
+--------------------------------------------------------------------------------
+${AnsiColor.BRIGHT_YELLOW}
+::: Spring-Boot ${spring-boot.formatted-version} :::
\ No newline at end of file
diff --git a/novel-admin/src/main/resources/mybatis/test/OrderMapper.xml b/novel-admin/src/main/resources/mybatis/test/OrderMapper.xml
deleted file mode 100644
index 664c1bb..0000000
--- a/novel-admin/src/main/resources/mybatis/test/OrderMapper.xml
+++ /dev/null
@@ -1,283 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 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 into fb_order
- (
- `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`
- )
- values
- (
- #{id},
- #{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}
- )
-
-
-
- update fb_order
-
- `fb_merchant_code` = #{fbMerchantCode},
- `merchant_order_sn` = #{merchantOrderSn},
- `order_sn` = #{orderSn},
- `platform_order_no` = #{platformOrderNo},
- `trade_no` = #{tradeNo},
- `order_state` = #{orderState},
- `fn_coupon` = #{fnCoupon},
- `red_packet` = #{redPacket},
- `total_fee` = #{totalFee},
- `order_price` = #{orderPrice},
- `fee` = #{fee},
- `body` = #{body},
- `attach` = #{attach},
- `store_id` = #{storeId},
- `cashier_id` = #{cashierId},
- `device_no` = #{deviceNo},
- `user_id` = #{userId},
- `user_logon_id` = #{userLogonId},
- `pay_time` = #{payTime},
- `pay_channel` = #{payChannel},
- `no_cash_coupon_fee` = #{noCashCouponFee},
- `cash_coupon_fee` = #{cashCouponFee},
- `cash_fee` = #{cashFee},
- `sign` = #{sign},
- `options` = #{options},
- `create_time` = #{createTime},
- `push_time` = #{pushTime},
- `push_ip` = #{pushIp},
- `mcht_id` = #{mchtId},
- `sn` = #{sn}
-
- where id = #{id}
-
-
-
- delete from fb_order where id = #{value}
-
-
-
- delete from fb_order where id in
-
- #{id}
-
-
-
-
\ No newline at end of file
diff --git a/novel-admin/src/main/resources/static/sql/test/order/menu.js b/novel-admin/src/main/resources/static/sql/test/order/menu.js
deleted file mode 100644
index 0b6d170..0000000
--- a/novel-admin/src/main/resources/static/sql/test/order/menu.js
+++ /dev/null
@@ -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';
diff --git a/novel-admin/src/main/resources/templates/test/order/add.html b/novel-admin/src/main/resources/templates/test/order/add.html
deleted file mode 100644
index df6f684..0000000
--- a/novel-admin/src/main/resources/templates/test/order/add.html
+++ /dev/null
@@ -1,327 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/novel-admin/src/main/resources/templates/test/order/detail.html b/novel-admin/src/main/resources/templates/test/order/detail.html
deleted file mode 100644
index 3377337..0000000
--- a/novel-admin/src/main/resources/templates/test/order/detail.html
+++ /dev/null
@@ -1,315 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/novel-admin/src/main/resources/templates/test/order/edit.html b/novel-admin/src/main/resources/templates/test/order/edit.html
deleted file mode 100644
index 4cf036a..0000000
--- a/novel-admin/src/main/resources/templates/test/order/edit.html
+++ /dev/null
@@ -1,323 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/novel-admin/src/main/resources/templates/test/order/order.html b/novel-admin/src/main/resources/templates/test/order/order.html
deleted file mode 100644
index b215a71..0000000
--- a/novel-admin/src/main/resources/templates/test/order/order.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/novel-admin/src/test/java/com/java2nb/testDemo/TestDemo.java b/novel-admin/src/test/java/com/java2nb/testDemo/TestDemo.java
deleted file mode 100644
index d6029b6..0000000
--- a/novel-admin/src/test/java/com/java2nb/testDemo/TestDemo.java
+++ /dev/null
@@ -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"));
- }
-
- ;
-}
diff --git a/novel-common/pom.xml b/novel-common/pom.xml
index 124e041..f2233f5 100644
--- a/novel-common/pom.xml
+++ b/novel-common/pom.xml
@@ -5,7 +5,7 @@
novel
com.java2nb
- 3.1.0
+ 3.6.0
4.0.0
@@ -123,6 +123,12 @@
true
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ true
+
+
diff --git a/novel-common/src/main/java/com/java2nb/novel/core/advice/CommonExceptionHandler.java b/novel-common/src/main/java/com/java2nb/novel/core/advice/CommonExceptionHandler.java
index 882f830..1296d0d 100644
--- a/novel-common/src/main/java/com/java2nb/novel/core/advice/CommonExceptionHandler.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/advice/CommonExceptionHandler.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
*
* @author 11797*/
@Slf4j
-@RestControllerAdvice
+@RestControllerAdvice(basePackages = "com.java2nb.novel.controller")
public class CommonExceptionHandler {
/**
diff --git a/novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java b/novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java
new file mode 100644
index 0000000..609ed6d
--- /dev/null
+++ b/novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java
@@ -0,0 +1,26 @@
+package com.java2nb.novel.core.advice;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ * 页面异常处理器
+ *
+ * @author 11797
+ */
+@Slf4j
+@ControllerAdvice(basePackages = "com.java2nb.novel.page")
+public class PageExceptionHandler {
+
+
+ /**
+ * 处理所有异常
+ */
+ @ExceptionHandler(Exception.class)
+ public String handlerException(Exception e) {
+ log.error(e.getMessage(), e);
+ //跳转页面过程中出现异常时统一跳转到404页面
+ return "404";
+ }
+}
diff --git a/novel-common/src/main/java/com/java2nb/novel/core/bean/PageBean.java b/novel-common/src/main/java/com/java2nb/novel/core/bean/PageBean.java
new file mode 100644
index 0000000..f4f837b
--- /dev/null
+++ b/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 分页集合类型
+ */
+@Data
+public class PageBean {
+
+ private Integer pageNum;
+ private Integer pageSize;
+ private Long total;
+ private List list;
+
+
+ /**
+ * 该构造函数用于PageHelper工具进行分页查询的场景
+ * 接收PageHelper分页后的list
+ */
+ public PageBean(List list){
+ PageInfo 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 list) {
+ this.pageNum = pageNum;
+ this.pageSize = pageSize;
+ this.total = total;
+ this.list = list;
+ }
+
+
+ //TODO 使用其他的分页工具或框架进行分页查询的场景
+
+
+
+}
diff --git a/novel-common/src/main/java/com/java2nb/novel/core/bean/ResultBean.java b/novel-common/src/main/java/com/java2nb/novel/core/bean/ResultBean.java
index d8152f2..d48a54d 100644
--- a/novel-common/src/main/java/com/java2nb/novel/core/bean/ResultBean.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/bean/ResultBean.java
@@ -8,8 +8,9 @@ import java.io.Serializable;
/**
* 自定义响应结构
- * @author 11797
+ *
* @param
+ * @author 11797
*/
@Data
public class ResultBean implements Serializable {
@@ -19,20 +20,20 @@ public class ResultBean 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 implements Serializable {
}
-
/**
* 业务处理成功,无数据返回
- * */
- public static ResultBean ok() {
- return new ResultBean();
+ */
+ public static ResultBean ok() {
+ return new ResultBean<>();
}
/**
* 业务处理成功，有数据返回
- * */
- public static ResultBean ok(T data) {
- return new ResultBean(data);
+ */
+ public static ResultBean ok(T data) {
+ return new ResultBean<>(data);
}
/**
* 业务处理失败
- * */
- public static ResultBean fail(ResponseStatus ResponseStatus) {
- return new ResultBean(ResponseStatus);
+ */
+ public static ResultBean fail(ResponseStatus responseStatus) {
+ return new ResultBean<>(responseStatus);
}
/**
* 系统错误
- * */
- public static ResultBean error() {
- return new ResultBean(ResponseStatus.ERROR);
+ */
+ public static ResultBean error() {
+ return new ResultBean<>(ResponseStatus.ERROR);
}
}
diff --git a/novel-common/src/main/java/com/java2nb/novel/core/cache/impl/EhCacheServiceImpl.java b/novel-common/src/main/java/com/java2nb/novel/core/cache/impl/EhCacheServiceImpl.java
index fa3937a..e935bdd 100644
--- a/novel-common/src/main/java/com/java2nb/novel/core/cache/impl/EhCacheServiceImpl.java
+++ b/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);
+
+ }
}
diff --git a/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java b/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java
index 5eb3d5b..b73bc5a 100644
--- a/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java
+++ b/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,"文件大小超出限制"),
/**
* 其他通用错误
diff --git a/novel-common/src/main/java/com/java2nb/novel/core/utils/BeanUtil.java b/novel-common/src/main/java/com/java2nb/novel/core/utils/BeanUtil.java
index e3d0280..2b1de8e 100644
--- a/novel-common/src/main/java/com/java2nb/novel/core/utils/BeanUtil.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/utils/BeanUtil.java
@@ -19,7 +19,7 @@ public class BeanUtil {
* @return 新集合
* */
@SneakyThrows
- public static List copyList(List source,Class targetClass){
+ public static List copyList(List source,Class targetClass){
List target = new ArrayList<>(source.size());
for( int i = 0 ; i < source.size() ; i++){
Object sourceItem = source.get(i);
diff --git a/novel-common/src/main/java/com/java2nb/novel/core/utils/FileUtil.java b/novel-common/src/main/java/com/java2nb/novel/core/utils/FileUtil.java
index 5661c49..50ea3dc 100644
--- a/novel-common/src/main/java/com/java2nb/novel/core/utils/FileUtil.java
+++ b/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);
+ }
+
+ }
}
diff --git a/novel-common/src/main/java/com/java2nb/novel/entity/News.java b/novel-common/src/main/java/com/java2nb/novel/entity/News.java
index c497248..c555349 100644
--- a/novel-common/src/main/java/com/java2nb/novel/entity/News.java
+++ b/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;
diff --git a/novel-common/src/main/java/com/java2nb/novel/mapper/NewsDynamicSqlSupport.java b/novel-common/src/main/java/com/java2nb/novel/mapper/NewsDynamicSqlSupport.java
index 43da731..7bb23e3 100644
--- a/novel-common/src/main/java/com/java2nb/novel/mapper/NewsDynamicSqlSupport.java
+++ b/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 title = news.title;
+ @Generated("org.mybatis.generator.api.MyBatisGenerator")
+ public static final SqlColumn readCount = news.readCount;
+
@Generated("org.mybatis.generator.api.MyBatisGenerator")
public static final SqlColumn createTime = news.createTime;
@@ -52,6 +55,8 @@ public final class NewsDynamicSqlSupport {
public final SqlColumn title = column("title", JDBCType.VARCHAR);
+ public final SqlColumn readCount = column("read_count", JDBCType.BIGINT);
+
public final SqlColumn createTime = column("create_time", JDBCType.TIMESTAMP);
public final SqlColumn createUserId = column("create_user_id", JDBCType.BIGINT);
diff --git a/novel-common/src/main/java/com/java2nb/novel/mapper/NewsMapper.java b/novel-common/src/main/java/com/java2nb/novel/mapper/NewsMapper.java
index 91d3ad5..f5a6916 100644
--- a/novel-common/src/main/java/com/java2nb/novel/mapper/NewsMapper.java
+++ b/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)
diff --git a/novel-common/src/main/resources/application-common-dev.yml b/novel-common/src/main/resources/application-common-dev.yml
index 7a08563..c87836f 100644
--- a/novel-common/src/main/resources/application-common-dev.yml
+++ b/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 #图片保存路径
\ No newline at end of file
+ storage: db #存储介质，db：数据库，file：txt文本
+ path: /Users/xiongxiaoyang/books #txt小说文本保存路径
\ No newline at end of file
diff --git a/novel-common/src/main/resources/application-common-prod.yml b/novel-common/src/main/resources/application-common-prod.yml
new file mode 100644
index 0000000..8853b0b
--- /dev/null
+++ b/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小说文本保存路径
+
+
+
+
+
diff --git a/novel-common/src/main/resources/application-common-test.yml b/novel-common/src/main/resources/application-common-test.yml
deleted file mode 100644
index 38d1e00..0000000
--- a/novel-common/src/main/resources/application-common-test.yml
+++ /dev/null
@@ -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 #图片保存路径
-
-
-
diff --git a/novel-common/src/main/resources/application-common.yml b/novel-common/src/main/resources/application-common.yml
index b3cf4a0..e98b078 100644
--- a/novel-common/src/main/resources/application-common.yml
+++ b/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
+
+
diff --git a/novel-common/src/main/resources/banner.txt b/novel-common/src/main/resources/banner.txt
new file mode 100644
index 0000000..9b09382
--- /dev/null
+++ b/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} :::
\ No newline at end of file
diff --git a/novel-common/src/main/resources/mybatis/generatorConfig.xml b/novel-common/src/main/resources/mybatis/generatorConfig.xml
index 5dbb62f..984a5aa 100644
--- a/novel-common/src/main/resources/mybatis/generatorConfig.xml
+++ b/novel-common/src/main/resources/mybatis/generatorConfig.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/novel-crawl/pom.xml b/novel-crawl/pom.xml
index 22c5dae..48efbe1 100644
--- a/novel-crawl/pom.xml
+++ b/novel-crawl/pom.xml
@@ -5,7 +5,7 @@
novel
com.java2nb
- 3.1.0
+ 3.6.0
4.0.0
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java b/novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java
index fe0f8d8..80c9c16 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java
@@ -1,13 +1,10 @@
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.*;
@@ -26,7 +23,7 @@ public class CrawlController {
* 新增爬虫源
* */
@PostMapping("addCrawlSource")
- public ResultBean addCrawlSource(CrawlSource source){
+ public ResultBean addCrawlSource(CrawlSource source){
crawlService.addCrawlSource(source);
return ResultBean.ok();
@@ -37,17 +34,16 @@ public class CrawlController {
* 爬虫源分页列表查询
* */
@GetMapping("listCrawlByPage")
- public ResultBean listCrawlByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
+ public ResultBean> 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 openOrCloseCrawl(Integer sourceId,Byte sourceStatus){
crawlService.openOrCloseCrawl(sourceId,sourceStatus);
@@ -58,7 +54,7 @@ public class CrawlController {
* 新增单本采集任务
* */
@PostMapping("addCrawlSingleTask")
- public ResultBean addCrawlSingleTask(CrawlSingleTask singleTask){
+ public ResultBean addCrawlSingleTask(CrawlSingleTask singleTask){
crawlService.addCrawlSingleTask(singleTask);
return ResultBean.ok();
@@ -69,17 +65,16 @@ public class CrawlController {
* 单本采集任务分页列表查询
* */
@GetMapping("listCrawlSingleTaskByPage")
- public ResultBean listCrawlSingleTaskByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
+ public ResultBean> 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));
}
/**
* 删除采集任务
* */
@DeleteMapping("delCrawlSingleTask/{id}")
- public ResultBean delCrawlSingleTask(@PathVariable("id") Long id){
+ public ResultBean delCrawlSingleTask(@PathVariable("id") Long id){
crawlService.delCrawlSingleTask(id);
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/controller/PageController.java b/novel-crawl/src/main/java/com/java2nb/novel/controller/PageController.java
index 1ac0143..f7c6477 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/controller/PageController.java
+++ b/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
*/
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/ChapterBean.java b/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/ChapterBean.java
new file mode 100644
index 0000000..6eaaa9b
--- /dev/null
+++ b/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 bookIndexList;
+
+ /**
+ * 章节内容集合
+ * */
+ List bookContentList;
+}
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlBookChapterHandler.java b/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlBookChapterHandler.java
new file mode 100644
index 0000000..e0a4eb6
--- /dev/null
+++ b/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);
+
+}
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlBookHandler.java b/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlBookHandler.java
new file mode 100644
index 0000000..7d6a8c0
--- /dev/null
+++ b/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);
+
+}
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java b/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java
index 505fd6b..3fd3d91 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java
@@ -26,18 +26,14 @@ 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 retryCount = new ThreadLocal<>();
+ private static final ThreadLocal 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 = getByHttpClientWithChrome(bookDetailUrl);
@@ -139,13 +135,10 @@ public class CrawlParser {
}
}
}
- return book;
+ handler.handle(book);
}
- public static Map parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean, Map hasIndexs) {
- Map 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 existBookIndexMap, CrawlBookChapterHandler handler) {
Date currentDate = new Date();
@@ -171,11 +164,11 @@ public class CrawlParser {
int indexNum = 0;
//总字数
- Integer totalWordCount = book.getWordCount() == null ? 0 : book.getWordCount();
+ 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))) {
@@ -221,7 +214,7 @@ public class CrawlParser {
BookIndex bookIndex = new BookIndex();
bookIndex.setIndexName(indexName);
bookIndex.setIndexNum(indexNum);
- Integer wordCount = StringUtil.getStrValidWordCount(content);
+ int wordCount = StringUtil.getStrValidWordCount(content);
bookIndex.setWordCount(wordCount);
indexList.add(bookIndex);
@@ -235,7 +228,7 @@ public class CrawlParser {
bookContent.setIndexId(hasIndex.getId());
//计算总字数
- totalWordCount = (totalWordCount+wordCount-hasIndex.getWordCount());
+ totalWordCount = (totalWordCount + wordCount - hasIndex.getWordCount());
} else {
//章节插入
//设置目录和章节内容
@@ -253,7 +246,6 @@ public class CrawlParser {
bookIndex.setUpdateTime(currentDate);
-
}
@@ -266,7 +258,7 @@ public class CrawlParser {
if (indexList.size() > 0) {
//如果有爬到最新章节，则设置小说主表的最新章节信息
//获取爬取到的最新章节
- BookIndex lastIndex = indexList.get(indexList.size()-1);
+ BookIndex lastIndex = indexList.get(indexList.size() - 1);
book.setLastIndexId(lastIndex.getId());
book.setLastIndexName(lastIndex.getIndexName());
book.setLastIndexUpdateTime(currentDate);
@@ -277,15 +269,22 @@ public class CrawlParser {
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;
}
}
+ handler.handle(new ChapterBean() {{
+ setBookIndexList(new ArrayList<>(0));
+ setBookContentList(new ArrayList<>(0));
+ }});
- return result;
}
@@ -294,6 +293,7 @@ public class CrawlParser {
ResponseEntity forEntity = restTemplate.getForEntity(url, String.class);
if (forEntity.getStatusCode() == HttpStatus.OK) {
String body = forEntity.getBody();
+ assert body != null;
if (body.length() < Constants.INVALID_HTML_LENGTH) {
return processErrorHttpResult(url);
}
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/RuleBean.java b/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/RuleBean.java
index 5a8d319..6b42685 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/RuleBean.java
+++ b/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;
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/core/listener/StarterListener.java b/novel-crawl/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
index d673dfd..ad57357 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
@@ -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,26 +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());
- book.setWordCount(needUpdateBook.getWordCount());
- if (needUpdateBook.getPicUrl() != null && needUpdateBook.getPicUrl().contains(Constants.LOCAL_PIC_PREFIX)) {
- //本地图片则不更新
- book.setPicUrl(null);
- }
- //查询已存在的章节
- Map existBookIndexMap = bookService.queryExistBookIndexMap(needUpdateBook.getId());
- //解析章节目录
- Map indexAndContentList = CrawlParser.parseBookIndexAndContent(needUpdateBook.getCrawlBookId(), book, ruleBean, existBookIndexMap);
- bookService.updateBookAndIndexAndContent(book, (List) indexAndContentList.get(CrawlParser.BOOK_INDEX_LIST_KEY), (List) 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 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);
}
@@ -107,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);
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/core/schedule/CrawlThreadMonitor.java b/novel-crawl/src/main/java/com/java2nb/novel/core/schedule/CrawlThreadMonitor.java
index 8003f39..1009cdf 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/core/schedule/CrawlThreadMonitor.java
+++ b/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;
/**
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/BookContentService.java b/novel-crawl/src/main/java/com/java2nb/novel/service/BookContentService.java
new file mode 100644
index 0000000..7090f3a
--- /dev/null
+++ b/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 bookContentList,Long bookId);
+
+ void saveBookContent(BookContent bookContent,Long bookId);
+
+ void updateBookContent(BookContent bookContent,Long bookId);
+
+
+}
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/BookService.java b/novel-crawl/src/main/java/com/java2nb/novel/service/BookService.java
index 1b343e9..2d521f0 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/service/BookService.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/service/BookService.java
@@ -72,6 +72,7 @@ public interface BookService {
* 更新一下最后一次的抓取时间
* @param bookId 小说ID
* */
+ @Deprecated
void updateCrawlLastTime(Long bookId);
/**
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java b/novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java
index 7c465a7..d8e9821 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java
+++ b/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 listCrawlByPage(int page, int pageSize);
+ PageBean 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 listCrawlSingleTaskByPage(int page, int pageSize);
+ PageBean listCrawlSingleTaskByPage(int page, int pageSize);
/**
* 删除采集任务
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
index 5f315b1..677d0c8 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
@@ -4,6 +4,7 @@ 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;
@@ -37,7 +38,7 @@ public class BookServiceImpl implements BookService {
private final CrawlBookIndexMapper bookIndexMapper;
- private final BookContentMapper bookContentMapper;
+ private final BookContentService bookContentService;
@Override
@@ -46,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;
}
@@ -57,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));
}
@@ -74,9 +75,9 @@ public class BookServiceImpl implements BookService {
@Transactional(rollbackFor = Exception.class)
@Override
public void saveBookAndIndexAndContent(Book book, List bookIndexList, List bookContentList) {
- if(!queryIsExistByBookNameAndAuthorName(book.getBookName(),book.getAuthorName())) {
+ if (!queryIsExistByBookNameAndAuthorName(book.getBookName(), book.getAuthorName())) {
- if(bookIndexList.size()>0) {
+ if (bookIndexList.size() > 0) {
//保存小说主表
@@ -85,7 +86,7 @@ public class BookServiceImpl implements BookService {
//批量保存目录和内容
bookIndexMapper.insertMultiple(bookIndexList);
- bookContentMapper.insertMultiple(bookContentList);
+ bookContentService.saveBookContent(bookContentList,book.getId());
}
}
@@ -96,7 +97,7 @@ public class BookServiceImpl implements BookService {
@Override
public List queryNeedUpdateBook(Date startDate, int limit) {
List books = bookMapper.queryNeedUpdateBook(startDate, limit);
- if(books.size()>0) {
+ if (books.size() > 0) {
//更新最后抓取时间为当前时间
bookMapper.updateCrawlLastTime(books, new Date());
}
@@ -105,38 +106,33 @@ public class BookServiceImpl implements BookService {
@Override
public Map queryExistBookIndexMap(Long bookId) {
- List bookIndexs = bookIndexMapper.selectMany(select(BookIndexDynamicSqlSupport.id,BookIndexDynamicSqlSupport.indexNum,BookIndexDynamicSqlSupport.indexName,BookIndexDynamicSqlSupport.wordCount)
+ List 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);
}
@Transactional(rollbackFor = Exception.class)
@Override
- public void updateBookAndIndexAndContent(Book book, List bookIndexList, List bookContentList, Map existBookIndexMap) {
+ public void updateBookAndIndexAndContent(Book book, List bookIndexList, List bookContentList, Map existBookIndexMap) {
for (int i = 0; i < bookIndexList.size(); i++) {
BookIndex bookIndex = bookIndexList.get(i);
BookContent bookContent = bookContentList.get(i);
- if(!existBookIndexMap.containsKey(bookIndex.getIndexNum())) {
+ if (!existBookIndexMap.containsKey(bookIndex.getIndexNum())) {
//插入
bookIndexMapper.insertSelective(bookIndex);
- bookContentMapper.insertSelective(bookContent);
- }else{
+ bookContentService.saveBookContent(bookContent,book.getId());
+ } else {
//更新
bookIndexMapper.updateByPrimaryKeySelective(bookIndex);
- bookContentMapper.update(update(BookContentDynamicSqlSupport.bookContent)
- .set(BookContentDynamicSqlSupport.content)
- .equalTo(bookContent.getContent())
- .where(BookContentDynamicSqlSupport.indexId,isEqualTo(bookContent.getIndexId()))
- .build()
- .render(RenderingStrategies.MYBATIS3));
+ bookContentService.updateBookContent(bookContent,book.getId());
}
@@ -145,7 +141,7 @@ public class BookServiceImpl implements BookService {
//更新小说主表
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);
@@ -168,7 +164,7 @@ public class BookServiceImpl implements BookService {
.build()
.render(RenderingStrategies.MYBATIS3));
- if(books.size()>0){
+ if (books.size() > 0) {
return books.get(0);
}
@@ -176,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);
-
- }
}
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java
index efcfee0..c9492cc 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java
+++ b/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,18 +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.core.utils.HttpUtil.getByHttpClientWithChrome;
-import static com.java2nb.novel.mapper.BookDynamicSqlSupport.crawlBookId;
-import static com.java2nb.novel.mapper.BookDynamicSqlSupport.crawlSourceId;
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;
/**
@@ -66,14 +71,17 @@ public class CrawlServiceImpl implements CrawlService {
}
@Override
- public List listCrawlByPage(int page, int pageSize) {
+ public PageBean 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 crawlSources = crawlSourceMapper.selectMany(render);
+ PageBean pageBean = new PageBean<>(crawlSources);
+ pageBean.setList(BeanUtil.copyList(crawlSources, CrawlSourceVO.class));
+ return pageBean;
}
@SneakyThrows
@@ -112,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());
@@ -156,14 +160,17 @@ public class CrawlServiceImpl implements CrawlService {
}
@Override
- public List listCrawlSingleTaskByPage(int page, int pageSize) {
+ public PageBean 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 crawlSingleTasks = crawlSingleTaskMapper.selectMany(render);
+ PageBean pageBean = new PageBean<>(crawlSingleTasks);
+ pageBean.setList(BeanUtil.copyList(crawlSingleTasks, CrawlSingleTaskVO.class));
+ return pageBean;
}
@Override
@@ -267,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 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) indexAndContentList.get(CrawlParser.BOOK_INDEX_LIST_KEY), (List) 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
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java
new file mode 100644
index 0000000..9cb75bc
--- /dev/null
+++ b/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 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));
+ }
+}
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java
new file mode 100644
index 0000000..28afc57
--- /dev/null
+++ b/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 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());
+ }
+}
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/vo/CrawlSingleTaskVO.java b/novel-crawl/src/main/java/com/java2nb/novel/vo/CrawlSingleTaskVO.java
index 4583856..9157501 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/vo/CrawlSingleTaskVO.java
+++ b/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 {
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/vo/CrawlSourceVO.java b/novel-crawl/src/main/java/com/java2nb/novel/vo/CrawlSourceVO.java
index d307ae7..45860fb 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/vo/CrawlSourceVO.java
+++ b/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{
diff --git a/novel-crawl/src/main/resources/application-prod.yml b/novel-crawl/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..54ce802
--- /dev/null
+++ b/novel-crawl/src/main/resources/application-prod.yml
@@ -0,0 +1,3 @@
+spring:
+ profiles:
+ include: [common-prod]
\ No newline at end of file
diff --git a/novel-crawl/src/main/resources/application.yml b/novel-crawl/src/main/resources/application.yml
index 394d285..132a14e 100644
--- a/novel-crawl/src/main/resources/application.yml
+++ b/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
+
+
+
diff --git a/novel-front/pom.xml b/novel-front/pom.xml
index 8876a94..da5eeac 100644
--- a/novel-front/pom.xml
+++ b/novel-front/pom.xml
@@ -5,7 +5,7 @@
novel
com.java2nb
- 3.1.0
+ 3.6.0
4.0.0
@@ -39,6 +39,12 @@
${jest.version}
+
+ org.elasticsearch.client
+ elasticsearch-rest-high-level-client
+ ${elasticsearch.version}
+
+
com.aliyun.oss
diff --git a/novel-front/src/main/java/com/java2nb/novel/FrontNovelApplication.java b/novel-front/src/main/java/com/java2nb/novel/FrontNovelApplication.java
index f83b2d9..3ace218 100644
--- a/novel-front/src/main/java/com/java2nb/novel/FrontNovelApplication.java
+++ b/novel-front/src/main/java/com/java2nb/novel/FrontNovelApplication.java
@@ -5,6 +5,7 @@ import io.shardingsphere.shardingjdbc.spring.boot.SpringBootConfiguration;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
@@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement
@EnableScheduling
@EnableCaching
+@ServletComponentScan
@MapperScan(basePackages = {"com.java2nb.novel.mapper"})
@Import(FdfsClientConfig.class)
public class FrontNovelApplication {
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java b/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
index ae2afad..9b23947 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
@@ -1,22 +1,21 @@
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.bean.UserDetails;
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.entity.Author;
+import com.java2nb.novel.entity.AuthorIncome;
+import com.java2nb.novel.entity.AuthorIncomeDetail;
import com.java2nb.novel.entity.Book;
import com.java2nb.novel.service.AuthorService;
import com.java2nb.novel.service.BookService;
-import com.java2nb.novel.service.FriendLinkService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.Date;
/**
@@ -36,7 +35,7 @@ public class AuthorController extends BaseController{
* 校验笔名是否存在
* */
@GetMapping("checkPenName")
- public ResultBean checkPenName(String penName){
+ public ResultBean checkPenName(String penName){
return ResultBean.ok(authorService.checkPenName(penName));
}
@@ -45,17 +44,16 @@ public class AuthorController extends BaseController{
* 作家发布小说分页列表查询
* */
@GetMapping("listBookByPage")
- public ResultBean listBookByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize ,HttpServletRequest request){
+ public ResultBean> listBookByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize , HttpServletRequest request){
- return ResultBean.ok(new PageInfo<>(bookService.listBookPageByUserId(getUserDetails(request).getId(),page,pageSize)
- ));
+ return ResultBean.ok(bookService.listBookPageByUserId(getUserDetails(request).getId(),page,pageSize));
}
/**
* 发布小说
* */
@PostMapping("addBook")
- public ResultBean addBook(@RequestParam("bookDesc") String bookDesc,Book book,HttpServletRequest request){
+ public ResultBean addBook(@RequestParam("bookDesc") String bookDesc,Book book,HttpServletRequest request){
Author author = checkAuthor(request);
@@ -73,7 +71,7 @@ public class AuthorController extends BaseController{
* 更新小说状态,上架或下架
* */
@PostMapping("updateBookStatus")
- public ResultBean updateBookStatus(Long bookId,Byte status,HttpServletRequest request){
+ public ResultBean updateBookStatus(Long bookId,Byte status,HttpServletRequest request){
Author author = checkAuthor(request);
//更新小说状态,上架或下架
@@ -88,7 +86,7 @@ public class AuthorController extends BaseController{
* 删除章节
*/
@DeleteMapping("deleteIndex/{indexId}")
- public ResultBean deleteIndex(@PathVariable("indexId") Long indexId, HttpServletRequest request) {
+ public ResultBean deleteIndex(@PathVariable("indexId") Long indexId, HttpServletRequest request) {
Author author = checkAuthor(request);
@@ -102,7 +100,7 @@ public class AuthorController extends BaseController{
* 更新章节名
*/
@PostMapping("updateIndexName")
- public ResultBean updateIndexName(Long indexId, String indexName, HttpServletRequest request) {
+ public ResultBean updateIndexName(Long indexId, String indexName, HttpServletRequest request) {
Author author = checkAuthor(request);
@@ -119,7 +117,7 @@ public class AuthorController extends BaseController{
* 发布章节内容
*/
@PostMapping("addBookContent")
- public ResultBean addBookContent(Long bookId, String indexName, String content,Byte isVip, HttpServletRequest request) {
+ public ResultBean addBookContent(Long bookId, String indexName, String content,Byte isVip, HttpServletRequest request) {
Author author = checkAuthor(request);
content = content.replaceAll("\\n", "
")
@@ -134,7 +132,7 @@ public class AuthorController extends BaseController{
* 查询章节内容
*/
@GetMapping("queryIndexContent/{indexId}")
- public ResultBean queryIndexContent(@PathVariable("indexId") Long indexId, HttpServletRequest request) {
+ public ResultBean queryIndexContent(@PathVariable("indexId") Long indexId, HttpServletRequest request) {
Author author = checkAuthor(request);
@@ -150,7 +148,7 @@ public class AuthorController extends BaseController{
* 更新章节内容
*/
@PostMapping("updateBookContent")
- public ResultBean updateBookContent(Long indexId, String indexName, String content, HttpServletRequest request) {
+ public ResultBean updateBookContent(Long indexId, String indexName, String content, HttpServletRequest request) {
Author author = checkAuthor(request);
content = content.replaceAll("\\n", "
")
@@ -161,19 +159,29 @@ public class AuthorController extends BaseController{
return ResultBean.ok();
}
+ /**
+ * 修改小说封面
+ */
+ @PostMapping("updateBookPic")
+ public ResultBean updateBookPic(@RequestParam("bookId") Long bookId,@RequestParam("bookPic") String bookPic,HttpServletRequest request) {
+ Author author = checkAuthor(request);
+ bookService.updateBookPic(bookId,bookPic, author.getId());
+ return ResultBean.ok();
+ }
+
+
/**
* 作家日收入统计数据分页列表查询
* */
@GetMapping("listIncomeDailyByPage")
- public ResultBean listIncomeDailyByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
- @RequestParam(value = "limit", defaultValue = "10") int pageSize ,
- @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
- @RequestParam(value = "startTime",defaultValue = "2020-05-01") Date startTime,
- @RequestParam(value = "endTime",defaultValue = "2030-01-01") Date endTime,
- HttpServletRequest request){
+ public ResultBean> listIncomeDailyByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
+ @RequestParam(value = "limit", defaultValue = "10") int pageSize ,
+ @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
+ @RequestParam(value = "startTime",defaultValue = "2020-05-01") Date startTime,
+ @RequestParam(value = "endTime",defaultValue = "2030-01-01") Date endTime,
+ HttpServletRequest request){
- return ResultBean.ok(new PageInfo<>(authorService.listIncomeDailyByPage(page,pageSize,getUserDetails(request).getId(),bookId,startTime,endTime)
- ));
+ return ResultBean.ok(authorService.listIncomeDailyByPage(page,pageSize,getUserDetails(request).getId(),bookId,startTime,endTime));
}
@@ -181,13 +189,12 @@ public class AuthorController extends BaseController{
* 作家月收入统计数据分页列表查询
* */
@GetMapping("listIncomeMonthByPage")
- public ResultBean listIncomeMonthByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
- @RequestParam(value = "limit", defaultValue = "10") int pageSize ,
- @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
- HttpServletRequest request){
+ public ResultBean> listIncomeMonthByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
+ @RequestParam(value = "limit", defaultValue = "10") int pageSize ,
+ @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
+ HttpServletRequest request){
- return ResultBean.ok(new PageInfo<>(authorService.listIncomeMonthByPage(page,pageSize,getUserDetails(request).getId(),bookId)
- ));
+ return ResultBean.ok(authorService.listIncomeMonthByPage(page,pageSize,getUserDetails(request).getId(),bookId));
}
private Author checkAuthor(HttpServletRequest request) {
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java b/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
index 3b157af..6bd0287 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
@@ -1,11 +1,18 @@
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.bean.UserDetails;
import com.java2nb.novel.core.enums.ResponseStatus;
+import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.entity.BookCategory;
import com.java2nb.novel.entity.BookComment;
-import com.java2nb.novel.search.BookSP;
+import com.java2nb.novel.entity.BookIndex;
+import com.java2nb.novel.service.BookContentService;
+import com.java2nb.novel.vo.BookCommentVO;
+import com.java2nb.novel.vo.BookSettingVO;
+import com.java2nb.novel.vo.BookSpVO;
import com.java2nb.novel.service.BookService;
import com.java2nb.novel.vo.BookVO;
import lombok.RequiredArgsConstructor;
@@ -16,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -25,10 +33,12 @@ import java.util.Map;
@RestController
@Slf4j
@RequiredArgsConstructor
-public class BookController extends BaseController{
+public class BookController extends BaseController {
private final BookService bookService;
+ private final BookContentService bookContentService;
+
private final RabbitTemplate rabbitTemplate;
@Value("${spring.rabbitmq.enable}")
@@ -37,78 +47,77 @@ public class BookController extends BaseController{
/**
* 查询首页小说设置列表数据
- * */
+ */
@GetMapping("listBookSetting")
- public ResultBean listBookSetting(){
+ public ResultBean>> listBookSetting() {
return ResultBean.ok(bookService.listBookSettingVO());
}
/**
* 查询首页点击榜单数据
- * */
+ */
@GetMapping("listClickRank")
- public ResultBean listClickRank(){
+ public ResultBean> listClickRank() {
return ResultBean.ok(bookService.listClickRank());
}
/**
* 查询首页新书榜单数据
- * */
+ */
@GetMapping("listNewRank")
- public ResultBean listNewRank(){
+ public ResultBean> listNewRank() {
return ResultBean.ok(bookService.listNewRank());
}
/**
* 查询首页更新榜单数据
- * */
+ */
@GetMapping("listUpdateRank")
- public ResultBean listUpdateRank(){
+ public ResultBean> listUpdateRank() {
return ResultBean.ok(bookService.listUpdateRank());
}
/**
* 查询小说分类列表
- * */
+ */
@GetMapping("listBookCategory")
- public ResultBean listBookCategory(){
+ public ResultBean> listBookCategory() {
return ResultBean.ok(bookService.listBookCategory());
}
/**
* 分页搜索
- * */
+ */
@GetMapping("searchByPage")
- public ResultBean searchByPage(BookSP bookSP, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "20") int pageSize){
- PageInfo pageInfo = bookService.searchByPage(bookSP,page,pageSize);
- return ResultBean.ok(pageInfo);
+ public ResultBean searchByPage(BookSpVO bookSP, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "20") int pageSize) {
+ return ResultBean.ok(bookService.searchByPage(bookSP, page, pageSize));
}
/**
* 查询小说详情信息
- * */
+ */
@GetMapping("queryBookDetail/{id}")
- public ResultBean queryBookDetail(@PathVariable("id") Long id){
+ public ResultBean queryBookDetail(@PathVariable("id") Long id) {
return ResultBean.ok(bookService.queryBookDetail(id));
}
/**
* 查询小说排行信息
- * */
+ */
@GetMapping("listRank")
- public ResultBean listRank(@RequestParam(value = "type",defaultValue = "0") Byte type,@RequestParam(value = "limit",defaultValue = "30") Integer limit){
- return ResultBean.ok(bookService.listRank(type,limit));
+ public ResultBean> listRank(@RequestParam(value = "type", defaultValue = "0") Byte type, @RequestParam(value = "limit", defaultValue = "30") Integer limit) {
+ return ResultBean.ok(bookService.listRank(type, limit));
}
/**
* 增加点击次数
- * */
+ */
@PostMapping("addVisitCount")
- public ResultBean addVisitCount(Long bookId){
- if(enableMq == 1) {
+ public ResultBean addVisitCount(Long bookId) {
+ if (enableMq == 1) {
rabbitTemplate.convertAndSend("ADD-BOOK-VISIT-EXCHANGE", null, bookId);
- }else {
+ } else {
bookService.addVisitCount(bookId, 1);
}
return ResultBean.ok();
@@ -116,68 +125,64 @@ public class BookController extends BaseController{
/**
* 查询章节相关信息
- * */
+ */
@GetMapping("queryBookIndexAbout")
- public ResultBean queryBookIndexAbout(Long bookId,Long lastBookIndexId) {
- Map data = new HashMap<>(2);
- data.put("bookIndexCount",bookService.queryIndexCount(bookId));
- String lastBookContent = bookService.queryBookContent(lastBookIndexId).getContent();
- if(lastBookContent.length()>42){
- lastBookContent=lastBookContent.substring(0,42);
+ public ResultBean> queryBookIndexAbout(Long bookId, Long lastBookIndexId) {
+ Map data = new HashMap<>(2);
+ data.put("bookIndexCount", bookService.queryIndexCount(bookId));
+ String lastBookContent = bookContentService.queryBookContent(bookId,lastBookIndexId).getContent();
+ if (lastBookContent.length() > 42) {
+ lastBookContent = lastBookContent.substring(0, 42);
}
- data.put("lastBookContent",lastBookContent);
+ data.put("lastBookContent", lastBookContent);
return ResultBean.ok(data);
}
/**
* 根据分类id查询同类推荐书籍
- * */
+ */
@GetMapping("listRecBookByCatId")
- public ResultBean listRecBookByCatId(Integer catId) {
+ public ResultBean> listRecBookByCatId(Integer catId) {
return ResultBean.ok(bookService.listRecBookByCatId(catId));
}
/**
- *分页查询书籍评论列表
- * */
+ * 分页查询书籍评论列表
+ */
@GetMapping("listCommentByPage")
- public ResultBean listCommentByPage(@RequestParam("bookId") Long bookId,@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize) {
- return ResultBean.ok(new PageInfo<>(bookService.listCommentByPage(null,bookId,page,pageSize)));
+ public ResultBean> listCommentByPage(@RequestParam("bookId") Long bookId, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize) {
+ return ResultBean.ok(bookService.listCommentByPage(null, bookId, page, pageSize));
}
/**
* 新增评价
- * */
+ */
@PostMapping("addBookComment")
- public ResultBean addBookComment(BookComment comment, HttpServletRequest request) {
+ public ResultBean addBookComment(BookComment comment, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
}
- bookService.addBookComment(userDetails.getId(),comment);
+ bookService.addBookComment(userDetails.getId(), comment);
return ResultBean.ok();
}
/**
* 根据小说ID查询小说前十条最新更新目录集合
- * */
+ */
@GetMapping("queryNewIndexList")
- public ResultBean queryNewIndexList(Long bookId){
- return ResultBean.ok(bookService.queryIndexList(bookId,"index_num desc",1,10));
+ public ResultBean> queryNewIndexList(Long bookId) {
+ return ResultBean.ok(bookService.queryIndexList(bookId, "index_num desc", 1, 10));
}
/**
* 目录页
- * */
+ */
@GetMapping("/queryIndexList")
- public ResultBean indexList(Long bookId,@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,@RequestParam(value = "orderBy",defaultValue = "index_num desc") String orderBy) {
- return ResultBean.ok(new PageInfo<>(bookService.queryIndexList(bookId,orderBy,page,pageSize)));
+ public ResultBean> indexList(Long bookId, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize, @RequestParam(value = "orderBy", defaultValue = "index_num desc") String orderBy) {
+ return ResultBean.ok(new PageBean<>(bookService.queryIndexList(bookId, orderBy, page, pageSize)));
}
-
-
-
-
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/CacheController.java b/novel-front/src/main/java/com/java2nb/novel/controller/CacheController.java
index 58cc991..e22f4b6 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/CacheController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/CacheController.java
@@ -40,7 +40,7 @@ public class CacheController {
* @param type 缓存类型，1：首页书籍推荐，2：首页新闻，3：首页友情链接
* */
@GetMapping("refresh/{pass}/{type}")
- public ResultBean refreshCache(@PathVariable("type") Byte type, @PathVariable("pass") String pass){
+ public ResultBean refreshCache(@PathVariable("type") Byte type, @PathVariable("pass") String pass){
if(!cacheManagerPass.equals(pass)){
return ResultBean.fail(ResponseStatus.PASSWORD_ERROR);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/FileController.java b/novel-front/src/main/java/com/java2nb/novel/controller/FileController.java
index d720343..6cd9eb3 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/FileController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/FileController.java
@@ -2,28 +2,23 @@ package com.java2nb.novel.controller;
import com.java2nb.novel.core.bean.ResultBean;
import com.java2nb.novel.core.cache.CacheService;
+import com.java2nb.novel.core.enums.ResponseStatus;
+import com.java2nb.novel.core.exception.BusinessException;
import com.java2nb.novel.core.utils.Constants;
+import com.java2nb.novel.core.utils.FileUtil;
import com.java2nb.novel.core.utils.RandomValidateCodeUtil;
-import com.java2nb.novel.core.utils.RestTemplateUtil;
import com.java2nb.novel.core.utils.UUIDUtil;
import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.Charsets;
import org.apache.http.client.utils.DateUtils;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import java.io.*;
import java.util.Date;
import java.util.Objects;
@@ -63,29 +58,35 @@ public class FileController {
}
/**
- * 文件上传
+ * 图片上传
+ * @return
*/
+ @SneakyThrows
@ResponseBody
- @PostMapping("/upload")
- ResultBean upload(@RequestParam("file") MultipartFile file) {
+ @PostMapping("/picUpload")
+ ResultBean upload(@RequestParam("file") MultipartFile file) {
Date currentDate = new Date();
- try {
- String savePath =
- Constants.LOCAL_PIC_PREFIX + DateUtils.formatDate(currentDate, "yyyy") + "/" +
- DateUtils.formatDate(currentDate, "MM") + "/" +
- DateUtils.formatDate(currentDate, "dd") ;
- String oriName = file.getOriginalFilename();
- String saveFileName = UUIDUtil.getUUID32() + oriName.substring(oriName.lastIndexOf("."));
- File saveFile = new File( picSavePath + savePath, saveFileName);
- if (!saveFile.getParentFile().exists()) {
- saveFile.getParentFile().mkdirs();
+ String savePath =
+ Constants.LOCAL_PIC_PREFIX + DateUtils.formatDate(currentDate, "yyyy") + "/" +
+ DateUtils.formatDate(currentDate, "MM") + "/" +
+ DateUtils.formatDate(currentDate, "dd");
+ String oriName = file.getOriginalFilename();
+ assert oriName != null;
+ String saveFileName = UUIDUtil.getUUID32() + oriName.substring(oriName.lastIndexOf("."));
+ File saveFile = new File(picSavePath + savePath, saveFileName);
+ if (!saveFile.getParentFile().exists()) {
+ boolean isSuccess = saveFile.getParentFile().mkdirs();
+ if(!isSuccess){
+ throw new BusinessException(ResponseStatus.FILE_DIR_MAKE_FAIL);
}
- file.transferTo(saveFile);
- return ResultBean.ok(savePath+"/"+saveFileName);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return ResultBean.error();
}
+ file.transferTo(saveFile);
+ if(!FileUtil.isImage(saveFile)){
+ //上传的文件不是图片
+ saveFile.delete();
+ throw new BusinessException(ResponseStatus.FILE_NOT_IMAGE);
+ };
+ return ResultBean.ok(savePath + "/" + saveFileName);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/FriendLinkController.java b/novel-front/src/main/java/com/java2nb/novel/controller/FriendLinkController.java
index 962d104..0857e2b 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/FriendLinkController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/FriendLinkController.java
@@ -1,6 +1,7 @@
package com.java2nb.novel.controller;
import com.java2nb.novel.core.bean.ResultBean;
+import com.java2nb.novel.entity.FriendLink;
import com.java2nb.novel.service.FriendLinkService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
* @author 11797
*/
@@ -24,7 +27,7 @@ public class FriendLinkController {
* 查询首页友情链接
* */
@GetMapping("listIndexLink")
- public ResultBean listIndexLink(){
+ public ResultBean> listIndexLink(){
return ResultBean.ok(friendLinkService.listIndexLink());
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/NewsController.java b/novel-front/src/main/java/com/java2nb/novel/controller/NewsController.java
index 0ca06ed..6eec326 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/NewsController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/NewsController.java
@@ -1,12 +1,16 @@
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.entity.News;
import com.java2nb.novel.service.NewsService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* @author 11797
*/
@@ -22,7 +26,7 @@ public class NewsController {
* 查询首页新闻
* */
@GetMapping("listIndexNews")
- public ResultBean listIndexNews(){
+ public ResultBean> listIndexNews(){
return ResultBean.ok(newsService.listIndexNews());
}
@@ -30,8 +34,17 @@ public class NewsController {
* 分页查询新闻列表
* */
@GetMapping("listByPage")
- public ResultBean listByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize){
- return ResultBean.ok(new PageInfo<>(newsService.listByPage(page,pageSize)));
+ public ResultBean> listByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize){
+ return ResultBean.ok(newsService.listByPage(page,pageSize));
+ }
+
+ /**
+ * 增加新闻阅读量
+ * */
+ @PostMapping("addReadCount")
+ public ResultBean addReadCount(@RequestParam(value = "newsId") Integer newsId){
+ newsService.addReadCount(newsId);
+ return ResultBean.ok();
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java b/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
deleted file mode 100644
index aa6ba24..0000000
--- a/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.java2nb.novel.controller;
-
-import com.java2nb.novel.core.bean.ResultBean;
-import com.java2nb.novel.core.bean.UserDetails;
-import com.java2nb.novel.core.utils.ThreadLocalUtil;
-import com.java2nb.novel.entity.*;
-import com.java2nb.novel.service.AuthorService;
-import com.java2nb.novel.service.BookService;
-import com.java2nb.novel.service.NewsService;
-import com.java2nb.novel.service.UserService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import javax.servlet.http.HttpServletRequest;
-import java.net.URLEncoder;
-import java.util.List;
-
-/**
- * @author 11797
- */
-@Slf4j
-@RequiredArgsConstructor
-@Controller
-public class PageController extends BaseController{
-
- private final BookService bookService;
-
- private final NewsService newsService;
-
- private final AuthorService authorService;
-
- private final UserService userService;
-
-
- @RequestMapping("{url}.html")
- public String module(@PathVariable("url") String url) {
- return url;
- }
-
- @RequestMapping("{module}/{url}.html")
- public String module2(@PathVariable("module") String module, @PathVariable("url") String url,HttpServletRequest request) {
-
- if(request.getRequestURI().startsWith("/author")) {
- //访问作者专区
- UserDetails user = getUserDetails(request);
- if (user == null) {
- //未登录
- return "redirect:/user/login.html?originUrl=" + request.getRequestURI();
- }
-
- boolean isAuthor = authorService.isAuthor(user.getId());
- if (!isAuthor) {
- return "redirect:/author/register.html" ;
- }
- }
-
- return module + "/" + url;
- }
-
- @RequestMapping("{module}/{classify}/{url}.html")
- public String module3(@PathVariable("module") String module, @PathVariable("classify") String classify, @PathVariable("url") String url) {
- return module + "/" + classify + "/" + url;
- }
-
- /**
- * 首页
- * */
- @RequestMapping(path = {"/", "/index", "/index.html"})
- public String index() {
- return ThreadLocalUtil.getTemplateDir()+"index";
- }
-
- /**
- * 作品页
- * */
- @RequestMapping("book/bookclass.html")
- public String bookClass() {
- return "book/bookclass";
- }
-
- /**
- * 排行页
- * */
- @RequestMapping("book/book_ranking.html")
- public String bookRank() {
-
- return ThreadLocalUtil.getTemplateDir()+"book/book_ranking";
- }
-
-
- /**
- * 详情页
- * */
- @RequestMapping("/book/{bookId}.html")
- public String bookDetail(@PathVariable("bookId") Long bookId, Model model) {
- Book book = bookService.queryBookDetail(bookId);
- model.addAttribute("book",book);
- if(book.getLastIndexId() != null) {
- //查询首章目录ID
- Long firstBookIndexId = bookService.queryFirstBookIndexId(bookId);
- model.addAttribute("firstBookIndexId", firstBookIndexId);
- }
- return ThreadLocalUtil.getTemplateDir()+"book/book_detail";
- }
-
- /**
- * 目录页
- * */
- @RequestMapping("/book/indexList-{bookId}.html")
- public String indexList(@PathVariable("bookId") Long bookId, Model model) {
- Book book = bookService.queryBookDetail(bookId);
- model.addAttribute("book",book);
- List bookIndexList = bookService.queryIndexList(bookId,null,1,null);
- model.addAttribute("bookIndexList",bookIndexList);
- model.addAttribute("bookIndexCount",bookIndexList.size());
- return ThreadLocalUtil.getTemplateDir()+"book/book_index";
- }
-
- /**
- * 内容页
- * */
- @RequestMapping("/book/{bookId}/{bookIndexId}.html")
- public String indexList(@PathVariable("bookId") Long bookId,@PathVariable("bookIndexId") Long bookIndexId, HttpServletRequest request,Model model) {
- //查询书籍
- Book book = bookService.queryBookDetail(bookId);
- model.addAttribute("book",book);
- //查询目录
- BookIndex bookIndex = bookService.queryBookIndex(bookIndexId);
- model.addAttribute("bookIndex",bookIndex);
- //查询上一章节目录ID
- Long preBookIndexId = bookService.queryPreBookIndexId(bookId,bookIndex.getIndexNum());
- model.addAttribute("preBookIndexId",preBookIndexId);
- //查询下一章目录ID
- Long nextBookIndexId = bookService.queryNextBookIndexId(bookId,bookIndex.getIndexNum());
- model.addAttribute("nextBookIndexId",nextBookIndexId);
- //查询内容
- BookContent bookContent = bookService.queryBookContent(bookIndex.getId());
- model.addAttribute("bookContent",bookContent);
-
- boolean needBuy = false;
- //判断该目录是否收费
- if(bookIndex.getIsVip()!=null && bookIndex.getIsVip() == 1 ){
- UserDetails user = getUserDetails(request);
- if(user == null){
- //未登录
- return "redirect:/user/login.html?originUrl="+request.getRequestURI();
- }
- //收费，判断用户是否购买过该目录
- boolean isBuy = userService.queryIsBuyBookIndex(user.getId(),bookIndexId);
- if(!isBuy){
- //没有购买过，需要购买
- bookContent.setContent(null);
- needBuy = true;
- }
- }
- model.addAttribute("needBuy",needBuy);
- return ThreadLocalUtil.getTemplateDir()+"book/book_content";
- }
-
- /**
- * 评论页面
- * */
- @RequestMapping("/book/comment-{bookId}.html")
- public String commentList(@PathVariable("bookId") Long bookId, Model model) {
- //查询书籍
- Book book = bookService.queryBookDetail(bookId);
- model.addAttribute("book",book);
- return "book/book_comment";
- }
-
- /**
- * 新闻内容页面
- * */
- @RequestMapping("/about/newsInfo-{newsId}.html")
- public String newsInfo(@PathVariable("newsId") Long newsId, Model model) {
- //查询新闻
- News news = newsService.queryNewsInfo(newsId);
- model.addAttribute("news",news);
- return "about/news_info";
- }
-
-
- /**
- * 作者注册页面
- * */
- @RequestMapping("author/register.html")
- public String authorRegister(Author author, HttpServletRequest request, Model model){
- UserDetails user = getUserDetails(request);
- if(user == null){
- //未登录
- return "redirect:/user/login.html?originUrl=/author/register.html";
- }
-
- if(StringUtils.isNotBlank(author.getInviteCode())) {
- //提交作者注册信息
- String errorInfo = authorService.register(user.getId(), author);
- if(StringUtils.isBlank(errorInfo)){
- //注册成功
- return "redirect:/author/index.html";
- }
- model.addAttribute("LabErr",errorInfo);
- model.addAttribute("author",author);
- }
- return "author/register";
- }
-
-
-}
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java b/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java
index 4fd2210..0656230 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java
@@ -5,7 +5,7 @@ import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.internal.util.AlipaySignature;
import com.alipay.api.request.AlipayTradePagePayRequest;
import com.java2nb.novel.core.bean.UserDetails;
-import com.java2nb.novel.core.config.AlipayConfig;
+import com.java2nb.novel.core.config.AlipayProperties;
import com.java2nb.novel.service.OrderService;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
/**
@@ -31,7 +31,7 @@ import java.util.Map;
public class PayController extends BaseController {
- private final AlipayConfig alipayConfig;
+ private final AlipayProperties alipayConfig;
private final OrderService orderService;
@@ -47,7 +47,6 @@ public class PayController extends BaseController {
if (userDetails == null) {
//未登录，跳转到登陆页面
httpResponse.sendRedirect("/user/login.html?originUrl=/pay/aliPay?payAmount="+payAmount);
- return;
}else {
//创建充值订单
Long outTradeNo = orderService.createPayOrder((byte)1,payAmount,userDetails.getId());
@@ -92,11 +91,10 @@ public class PayController extends BaseController {
PrintWriter out = httpResponse.getWriter();
//获取支付宝POST过来反馈信息
- Map params = new HashMap();
+ Map params = new HashMap<>();
Map requestParams = request.getParameterMap();
- for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
- String name = (String) iter.next();
- String[] values = (String[]) requestParams.get(name);
+ for (String name : requestParams.keySet()) {
+ String[] values = requestParams.get(name);
String valueStr = "";
for (int i = 0; i < values.length; i++) {
valueStr = (i == values.length - 1) ? valueStr + values[i]
@@ -119,13 +117,13 @@ public class PayController extends BaseController {
if(signVerified) {
//验证成功
//商户订单号
- String outTradeNo = new String(request.getParameter("out_trade_no").getBytes("ISO-8859-1"),"UTF-8");
+ String outTradeNo = new String(request.getParameter("out_trade_no").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
//支付宝交易号
- String tradeNo = new String(request.getParameter("trade_no").getBytes("ISO-8859-1"),"UTF-8");
+ String tradeNo = new String(request.getParameter("trade_no").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
//交易状态
- String tradeStatus = new String(request.getParameter("trade_status").getBytes("ISO-8859-1"),"UTF-8");
+ String tradeStatus = new String(request.getParameter("trade_status").getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
//更新订单状态
orderService.updatePayOrder(Long.parseLong(outTradeNo), tradeNo, tradeStatus);
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
index 2d52820..8ae40d4 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
@@ -1,6 +1,5 @@
package com.java2nb.novel.controller;
-import com.github.pagehelper.PageInfo;
import com.java2nb.novel.core.bean.ResultBean;
import com.java2nb.novel.core.bean.UserDetails;
import com.java2nb.novel.core.cache.CacheService;
@@ -19,7 +18,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
import java.util.HashMap;
import java.util.Map;
@@ -43,7 +41,7 @@ public class UserController extends BaseController {
* 登陆
*/
@PostMapping("login")
- public ResultBean login(User user) {
+ public ResultBean> login(User user) {
//登陆
UserDetails userDetails = userService.login(user);
@@ -60,7 +58,7 @@ public class UserController extends BaseController {
* 注册
*/
@PostMapping("register")
- public ResultBean register(@Validated({AddGroup.class}) User user, @RequestParam(value = "velCode", defaultValue = "") String velCode) {
+ public ResultBean register(@Validated({AddGroup.class}) User user, @RequestParam(value = "velCode", defaultValue = "") String velCode) {
//判断验证码是否正确
@@ -83,7 +81,7 @@ public class UserController extends BaseController {
* 刷新token
*/
@PostMapping("refreshToken")
- public ResultBean refreshToken(HttpServletRequest request) {
+ public ResultBean refreshToken(HttpServletRequest request) {
String token = getToken(request);
if (jwtTokenUtil.canRefresh(token)) {
token = jwtTokenUtil.refreshToken(token);
@@ -104,7 +102,7 @@ public class UserController extends BaseController {
* 查询小说是否已加入书架
*/
@GetMapping("queryIsInShelf")
- public ResultBean queryIsInShelf(Long bookId, HttpServletRequest request) {
+ public ResultBean queryIsInShelf(Long bookId, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -116,7 +114,7 @@ public class UserController extends BaseController {
* 加入书架
* */
@PostMapping("addToBookShelf")
- public ResultBean addToBookShelf(Long bookId,Long preContentId, HttpServletRequest request) {
+ public ResultBean addToBookShelf(Long bookId,Long preContentId, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -129,7 +127,7 @@ public class UserController extends BaseController {
* 移出书架
* */
@DeleteMapping("removeFromBookShelf/{bookId}")
- public ResultBean removeFromBookShelf(@PathVariable("bookId") Long bookId, HttpServletRequest request) {
+ public ResultBean removeFromBookShelf(@PathVariable("bookId") Long bookId, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -142,31 +140,31 @@ public class UserController extends BaseController {
* 分页查询书架
* */
@GetMapping("listBookShelfByPage")
- public ResultBean listBookShelfByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
+ public ResultBean listBookShelfByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
}
- return ResultBean.ok(new PageInfo<>(userService.listBookShelfByPage(userDetails.getId(),page,pageSize)));
+ return ResultBean.ok(userService.listBookShelfByPage(userDetails.getId(),page,pageSize));
}
/**
* 分页查询阅读记录
* */
@GetMapping("listReadHistoryByPage")
- public ResultBean listReadHistoryByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
+ public ResultBean listReadHistoryByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
}
- return ResultBean.ok(new PageInfo<>(userService.listReadHistoryByPage(userDetails.getId(),page,pageSize)));
+ return ResultBean.ok(userService.listReadHistoryByPage(userDetails.getId(),page,pageSize));
}
/**
* 添加阅读记录
* */
@PostMapping("addReadHistory")
- public ResultBean addReadHistory(Long bookId,Long preContentId, HttpServletRequest request) {
+ public ResultBean addReadHistory(Long bookId,Long preContentId, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -179,7 +177,7 @@ public class UserController extends BaseController {
* 添加反馈
* */
@PostMapping("addFeedBack")
- public ResultBean addFeedBack(String content, HttpServletRequest request) {
+ public ResultBean addFeedBack(String content, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -192,19 +190,19 @@ public class UserController extends BaseController {
* 分页查询我的反馈列表
* */
@GetMapping("listUserFeedBackByPage")
- public ResultBean listUserFeedBackByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request){
+ public ResultBean listUserFeedBackByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request){
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
}
- return ResultBean.ok(new PageInfo<>(userService.listUserFeedBackByPage(userDetails.getId(),page,pageSize)));
+ return ResultBean.ok(userService.listUserFeedBackByPage(userDetails.getId(),page,pageSize));
}
/**
* 查询个人信息
* */
@GetMapping("userInfo")
- public ResultBean userInfo(HttpServletRequest request) {
+ public ResultBean userInfo(HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -216,7 +214,7 @@ public class UserController extends BaseController {
* 更新个人信息
* */
@PostMapping("updateUserInfo")
- public ResultBean updateUserInfo(@Validated({UpdateGroup.class}) User user, HttpServletRequest request) {
+ public ResultBean updateUserInfo(@Validated({UpdateGroup.class}) User user, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -236,7 +234,7 @@ public class UserController extends BaseController {
* 更新密码
* */
@PostMapping("updatePassword")
- public ResultBean updatePassword(String oldPassword,String newPassword1,String newPassword2,HttpServletRequest request) {
+ public ResultBean updatePassword(String oldPassword,String newPassword1,String newPassword2,HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -252,12 +250,12 @@ public class UserController extends BaseController {
* 分页查询用户书评
* */
@GetMapping("listCommentByPage")
- public ResultBean listCommentByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,HttpServletRequest request) {
+ public ResultBean listCommentByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
}
- return ResultBean.ok(new PageInfo<>(bookService.listCommentByPage(userDetails.getId(),null,page,pageSize)));
+ return ResultBean.ok(bookService.listCommentByPage(userDetails.getId(),null,page,pageSize));
}
@@ -265,7 +263,7 @@ public class UserController extends BaseController {
* 购买小说章节
* */
@PostMapping("buyBookIndex")
- public ResultBean buyBookIndex(UserBuyRecord buyRecord, HttpServletRequest request) {
+ public ResultBean buyBookIndex(UserBuyRecord buyRecord, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/AlipayConfig.java b/novel-front/src/main/java/com/java2nb/novel/core/config/AlipayProperties.java
similarity index 94%
rename from novel-front/src/main/java/com/java2nb/novel/core/config/AlipayConfig.java
rename to novel-front/src/main/java/com/java2nb/novel/core/config/AlipayProperties.java
index 0d31fa8..597cdbc 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/AlipayConfig.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/AlipayProperties.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
@Data
@Component
@ConfigurationProperties(prefix="alipay")
-public class AlipayConfig {
+public class AlipayProperties {
private String appId;
private String merchantPrivateKey;
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/AuthorIncomeConfig.java b/novel-front/src/main/java/com/java2nb/novel/core/config/AuthorIncomeProperties.java
similarity index 86%
rename from novel-front/src/main/java/com/java2nb/novel/core/config/AuthorIncomeConfig.java
rename to novel-front/src/main/java/com/java2nb/novel/core/config/AuthorIncomeProperties.java
index 1fc1743..1ce42b0 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/AuthorIncomeConfig.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/AuthorIncomeProperties.java
@@ -7,13 +7,13 @@ import org.springframework.stereotype.Component;
import java.math.BigDecimal;
/**
- * 作家收入配置
+ * 作家收入配置属性
* @author cd
*/
@Component
@Data
@ConfigurationProperties(prefix = "author.income")
-public class AuthorIncomeConfig {
+public class AuthorIncomeProperties {
private BigDecimal taxRate;
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/BookPriceConfig.java b/novel-front/src/main/java/com/java2nb/novel/core/config/BookPriceProperties.java
similarity index 85%
rename from novel-front/src/main/java/com/java2nb/novel/core/config/BookPriceConfig.java
rename to novel-front/src/main/java/com/java2nb/novel/core/config/BookPriceProperties.java
index 6a2c7fa..305f2b6 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/BookPriceConfig.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/BookPriceProperties.java
@@ -7,13 +7,13 @@ import org.springframework.stereotype.Component;
import java.math.BigDecimal;
/**
- * 章节费用配置
+ * 章节费用配置属性
* @author cd
*/
@Component
@Data
@ConfigurationProperties(prefix = "book.price")
-public class BookPriceConfig {
+public class BookPriceProperties {
private BigDecimal wordCount;
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/ErrorPageConfig.java b/novel-front/src/main/java/com/java2nb/novel/core/config/ErrorPageConfig.java
new file mode 100644
index 0000000..1dd2d6f
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/ErrorPageConfig.java
@@ -0,0 +1,25 @@
+package com.java2nb.novel.core.config;
+
+import org.springframework.boot.web.server.ErrorPage;
+import org.springframework.boot.web.server.ErrorPageRegistrar;
+import org.springframework.boot.web.server.ErrorPageRegistry;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+
+/**
+ * 错误页面配置
+ * @author xiongxiaoyang
+ */
+@Configuration
+public class ErrorPageConfig implements ErrorPageRegistrar {
+
+ @Override
+ public void registerErrorPages(ErrorPageRegistry registry) {
+ /*1.错误类型为404，默认显示404.html网页*/
+ ErrorPage e404 = new ErrorPage(HttpStatus.NOT_FOUND, "/404.html");
+ /**
+ TODO 2.错误类型为500，表示服务器响应错误，默认显示/500.html网页
+ */
+ registry.addErrorPages(e404);
+ }
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/EsConfig.java b/novel-front/src/main/java/com/java2nb/novel/core/config/EsConfig.java
new file mode 100644
index 0000000..f70da08
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/EsConfig.java
@@ -0,0 +1,41 @@
+package com.java2nb.novel.core.config;
+
+
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * elasticsearch搜索引擎配置
+ * @author xiongxiaoyang
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "spring.elasticsearch", name = "enable", havingValue = "1")
+public class EsConfig {
+
+ @Value("${spring.elasticsearch.jest.uris}")
+ private String esUris;
+
+ @Bean
+ public RestHighLevelClient esClient(){
+
+
+ String[] uris = esUris.split(",");
+ HttpHost[] hosts = new HttpHost[uris.length];
+ for(int i = 0 ; i < uris.length ; i++){
+ String uri = uris[i];
+ String scheme = uri.substring(0,uri.indexOf(":")).trim();
+ String hostname = uri.substring(uri.indexOf("://")+3,uri.lastIndexOf(":")).trim();
+ int port = Integer.parseInt(uri.substring(uri.lastIndexOf(":")+1).trim());
+ hosts[i] = new HttpHost(hostname,port,scheme);
+ }
+
+ return new RestHighLevelClient(
+ RestClient.builder(hosts));
+
+ }
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/FdfsConfiguration.java b/novel-front/src/main/java/com/java2nb/novel/core/config/FdfsConfig.java
similarity index 91%
rename from novel-front/src/main/java/com/java2nb/novel/core/config/FdfsConfiguration.java
rename to novel-front/src/main/java/com/java2nb/novel/core/config/FdfsConfig.java
index 485ad08..89711fa 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/FdfsConfiguration.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/FdfsConfig.java
@@ -9,5 +9,5 @@ import org.springframework.jmx.support.RegistrationPolicy;
*/
@Configuration
@EnableMBeanExport(registration= RegistrationPolicy.IGNORE_EXISTING)
-public class FdfsConfiguration {
+public class FdfsConfig {
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/FilterConfig.java b/novel-front/src/main/java/com/java2nb/novel/core/config/FilterConfig.java
index 845b02c..7229594 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/FilterConfig.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/FilterConfig.java
@@ -32,7 +32,7 @@ public class FilterConfig{
private String urlPatterns;
@Bean
- public FilterRegistrationBean filterRegist() {
+ public FilterRegistrationBean filterRegister() {
FilterRegistrationBean frBean = new FilterRegistrationBean<>();
frBean.setFilter(new NovelFilter());
frBean.addUrlPatterns("/*");
@@ -41,9 +41,9 @@ public class FilterConfig{
}
@Bean
- public FilterRegistrationBean xssFilterRegistration()
+ public FilterRegistrationBean xssFilterRegistration()
{
- FilterRegistrationBean registration = new FilterRegistrationBean();
+ FilterRegistrationBean registration = new FilterRegistrationBean<>();
//
registration.setDispatcherTypes(DispatcherType.REQUEST);
//过滤器类（继承Filter）
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolConfig.java b/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolConfig.java
new file mode 100644
index 0000000..6fdfb6a
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolConfig.java
@@ -0,0 +1,23 @@
+package com.java2nb.novel.core.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 线程池配置
+ * @author xiongxiaoyang
+ */
+@Configuration
+public class ThreadPoolConfig {
+
+ @Bean
+ public ThreadPoolExecutor threadPoolExecutor(ThreadPoolProperties properties){
+ return new ThreadPoolExecutor(properties.getCorePoolSize(),properties.getMaximumPoolSize(),properties.getKeepAliveTime()
+ , TimeUnit.SECONDS, new LinkedBlockingDeque<>(properties.getQueueSize()),new ThreadPoolExecutor.AbortPolicy());
+ }
+
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolProperties.java b/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolProperties.java
new file mode 100644
index 0000000..bf236f3
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolProperties.java
@@ -0,0 +1,22 @@
+package com.java2nb.novel.core.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 线程池配置属性
+ * @author xiongxiaoyang
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "thread.pool")
+public class ThreadPoolProperties {
+
+ private Integer corePoolSize;
+ private Integer maximumPoolSize;
+ private Long keepAliveTime;
+ private Integer queueSize;
+
+
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/WebsiteProperties.java b/novel-front/src/main/java/com/java2nb/novel/core/config/WebsiteProperties.java
new file mode 100644
index 0000000..a839a3c
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/WebsiteProperties.java
@@ -0,0 +1,20 @@
+package com.java2nb.novel.core.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author 11797
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix="website")
+public class WebsiteProperties {
+
+ private String name;
+ private String domain;
+ private String keyword;
+ private String description;
+ private String qq;
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/filter/NovelFilter.java b/novel-front/src/main/java/com/java2nb/novel/core/filter/NovelFilter.java
index 63f5f04..0f01f58 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/filter/NovelFilter.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/filter/NovelFilter.java
@@ -38,7 +38,7 @@ public class NovelFilter implements Filter {
//缓存10天
resp.setDateHeader("expires", System.currentTimeMillis()+60*60*24*10*1000);
OutputStream out = resp.getOutputStream();
- InputStream input = new FileInputStream(new File(picSavePath + requestUri));
+ InputStream input = new FileInputStream(picSavePath + requestUri);
byte[] b = new byte[4096];
for (int n; (n = input.read(b)) != -1; ) {
out.write(b, 0, n);
@@ -55,7 +55,7 @@ public class NovelFilter implements Filter {
userMark = UUIDUtil.getUUID32();
CookieUtil.setCookie(resp,Constants.USER_CLIENT_MARK_KEY,userMark);
}
- ThreadLocalUtil.setCientId(userMark);
+ ThreadLocalUtil.setClientId(userMark);
//根据浏览器类型选择前端模板
String to = req.getParameter("to");
CacheService cacheService = SpringUtil.getBean(CacheService.class);
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/filter/XssFilter.java b/novel-front/src/main/java/com/java2nb/novel/core/filter/XssFilter.java
index 8ac39e0..898ccb9 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/filter/XssFilter.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/filter/XssFilter.java
@@ -6,8 +6,8 @@ import org.apache.commons.lang3.StringUtils;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -34,12 +34,10 @@ public class XssFilter implements Filter {
String tempEnabled = filterConfig.getInitParameter("enabled");
if (StringUtils.isNotBlank(tempExcludes)) {
String[] url = tempExcludes.split(",");
- for (int i = 0; url != null && i < url.length; i++) {
- excludes.add(url[i]);
- }
+ excludes.addAll(Arrays.asList(url));
}
if (StringUtils.isNotEmpty(tempEnabled)) {
- enabled = Boolean.valueOf(tempEnabled);
+ enabled = Boolean.parseBoolean(tempEnabled);
}
}
@@ -48,8 +46,7 @@ public class XssFilter implements Filter {
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
{
HttpServletRequest req = (HttpServletRequest) request;
- HttpServletResponse resp = (HttpServletResponse) response;
- if (handleExcludeURL(req, resp)) {
+ if (handleExcludeURL(req)) {
chain.doFilter(request, response);
return;
}
@@ -57,7 +54,7 @@ public class XssFilter implements Filter {
chain.doFilter(xssRequest, response);
}
- private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response) {
+ private boolean handleExcludeURL(HttpServletRequest request) {
if (!enabled) {
return true;
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/listener/StarterListener.java b/novel-front/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
new file mode 100644
index 0000000..7ae5c58
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
@@ -0,0 +1,28 @@
+package com.java2nb.novel.core.listener;
+
+import com.java2nb.novel.core.config.WebsiteProperties;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+/**
+ * 启动监听器
+ * @author xiongxiaoyang
+ */
+@WebListener
+@Slf4j
+@RequiredArgsConstructor
+public class StarterListener implements ServletContextListener {
+
+ private final WebsiteProperties websiteConfig;
+
+
+ @Override
+ public void contextInitialized(ServletContextEvent sce) {
+ sce.getServletContext().setAttribute("website",websiteConfig);
+
+ }
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/schedule/BookToEsSchedule.java b/novel-front/src/main/java/com/java2nb/novel/core/schedule/BookToEsSchedule.java
index a179255..8300e2b 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/schedule/BookToEsSchedule.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/schedule/BookToEsSchedule.java
@@ -2,19 +2,11 @@ package com.java2nb.novel.core.schedule;
import com.java2nb.novel.core.cache.CacheKey;
import com.java2nb.novel.core.cache.CacheService;
-import com.java2nb.novel.core.utils.BeanUtil;
import com.java2nb.novel.entity.Book;
import com.java2nb.novel.service.BookService;
import com.java2nb.novel.service.SearchService;
-import com.java2nb.novel.vo.EsBookVO;
-import io.searchbox.client.JestClient;
-import io.searchbox.core.DocumentResult;
-import io.searchbox.core.Index;
import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
@@ -68,8 +60,6 @@ public class BookToEsSchedule {
}
-
-
cacheService.setObject(CacheKey.ES_LAST_UPDATE_TIME, lastDate);
} catch (Exception e) {
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/schedule/DailyIncomeStaSchedule.java b/novel-front/src/main/java/com/java2nb/novel/core/schedule/DailyIncomeStaSchedule.java
index 8ffde36..f97fd5a 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/schedule/DailyIncomeStaSchedule.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/schedule/DailyIncomeStaSchedule.java
@@ -1,7 +1,6 @@
package com.java2nb.novel.core.schedule;
-import com.java2nb.novel.core.config.AuthorIncomeConfig;
import com.java2nb.novel.core.utils.DateUtil;
import com.java2nb.novel.entity.Author;
import com.java2nb.novel.entity.AuthorIncomeDetail;
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/schedule/MonthIncomeStaSchedule.java b/novel-front/src/main/java/com/java2nb/novel/core/schedule/MonthIncomeStaSchedule.java
index c0dc232..554d835 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/schedule/MonthIncomeStaSchedule.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/schedule/MonthIncomeStaSchedule.java
@@ -1,19 +1,17 @@
package com.java2nb.novel.core.schedule;
-import com.java2nb.novel.core.config.AuthorIncomeConfig;
+import com.java2nb.novel.core.config.AuthorIncomeProperties;
import com.java2nb.novel.core.utils.DateUtil;
import com.java2nb.novel.entity.*;
import com.java2nb.novel.service.AuthorService;
import com.java2nb.novel.service.BookService;
-import com.java2nb.novel.service.UserService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -31,7 +29,7 @@ public class MonthIncomeStaSchedule {
private final BookService bookService;
- private final AuthorIncomeConfig authorIncomeConfig;
+ private final AuthorIncomeProperties authorIncomeConfig;
/**
* 每个月1号凌晨2点统计上个月数据
@@ -60,8 +58,8 @@ public class MonthIncomeStaSchedule {
//2.查询作家作品
List books = bookService.queryBookList(authorId);
- Long totalPreTaxIncome = 0L;
- Long totalAfterTaxIncome = 0L;
+ long totalPreTaxIncome = 0L;
+ long totalAfterTaxIncome = 0L;
for (Book book : books) {
Long bookId = book.getId();
@@ -72,14 +70,14 @@ public class MonthIncomeStaSchedule {
BigDecimal monthIncomeShare = new BigDecimal(monthIncome)
.multiply(authorIncomeConfig.getShareProportion());
- Long preTaxIncome = monthIncomeShare
+ long preTaxIncome = monthIncomeShare
.multiply(authorIncomeConfig.getExchangeProportion())
.multiply(new BigDecimal(100))
.longValue();
totalPreTaxIncome += preTaxIncome;
- Long afterTaxIncome = monthIncomeShare
+ long afterTaxIncome = monthIncomeShare
.multiply(authorIncomeConfig.getTaxRate())
.multiply(authorIncomeConfig.getExchangeProportion())
.multiply(new BigDecimal(100))
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/serialize/CommentUserNameSerialize.java b/novel-front/src/main/java/com/java2nb/novel/core/serialize/CommentUserNameSerialize.java
new file mode 100644
index 0000000..8e86da2
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/core/serialize/CommentUserNameSerialize.java
@@ -0,0 +1,20 @@
+package com.java2nb.novel.core.serialize;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.IOException;
+
+public class CommentUserNameSerialize extends JsonSerializer {
+
+ @Override
+ public void serialize(String s, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+
+ if(StringUtils.isNotBlank(s)){
+ jsonGenerator.writeString(s.substring(0, 4) + "****" + s.substring(s.length() - 3));
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/utils/Constants.java b/novel-front/src/main/java/com/java2nb/novel/core/utils/Constants.java
index 7736233..f150cb2 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/utils/Constants.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/utils/Constants.java
@@ -29,7 +29,7 @@ public class Constants {
/**
* 首页设置的小说数量
* */
- public static final int INDEX_BOOK_SETTING_NUM = 32;
+ public static final int INDEX_BOOK_SETTING_NUM = 31;
/**
* 累积的最大点击量
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/utils/JwtTokenUtil.java b/novel-front/src/main/java/com/java2nb/novel/core/utils/JwtTokenUtil.java
index 962c262..169c55b 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/utils/JwtTokenUtil.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/utils/JwtTokenUtil.java
@@ -86,7 +86,11 @@ public class JwtTokenUtil {
*/
private boolean isTokenExpired(String token) {
Date expiredDate = getExpiredDateFromToken(token);
- return expiredDate.before(new Date());
+ if(expiredDate == null){
+ return true;
+ }else {
+ return expiredDate.before(new Date());
+ }
}
/**
@@ -94,7 +98,7 @@ public class JwtTokenUtil {
*/
private Date getExpiredDateFromToken(String token) {
Claims claims = getClaimsFromToken(token);
- return claims.getExpiration();
+ return claims != null ? claims.getExpiration() : null;
}
/**
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/utils/ThreadLocalUtil.java b/novel-front/src/main/java/com/java2nb/novel/core/utils/ThreadLocalUtil.java
index 2c63f4c..b830c6f 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/utils/ThreadLocalUtil.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/utils/ThreadLocalUtil.java
@@ -12,12 +12,12 @@ public class ThreadLocalUtil {
/**
* 存储当前线程访问的模板目录
* */
- private static ThreadLocal templateDir = new ThreadLocal<>();
+ private static final ThreadLocal templateDir = new ThreadLocal<>();
/**
* 存储当前会话的sessionID
* */
- private static ThreadLocal clientId = new ThreadLocal<>();
+ private static final ThreadLocal clientId = new ThreadLocal<>();
/**
* 设置当前应该访问的模板目录
@@ -41,7 +41,7 @@ public class ThreadLocalUtil {
/**
* 设置当前访问线程的客户端ID
* */
- public static void setCientId(String id){
+ public static void setClientId(String id){
clientId.set(id);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/wrapper/XssHttpServletRequestWrapper.java b/novel-front/src/main/java/com/java2nb/novel/core/wrapper/XssHttpServletRequestWrapper.java
index b56f7fa..c99e459 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/wrapper/XssHttpServletRequestWrapper.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/wrapper/XssHttpServletRequestWrapper.java
@@ -14,11 +14,6 @@ import java.util.List;
*/
public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
- /**
- * 假如有有html 代码是自己传来的 需要设定对应的name 不过滤
- */
- private static final List noFilterNames = Arrays.asList("content");
-
/**
* @param request
*/
@@ -29,14 +24,14 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
@Override
public String[] getParameterValues(String name) {
String[] values = super.getParameterValues(name);
- if (!noFilterNames.contains(name) && values != null) {
+ if (values != null) {
int length = values.length;
- String[] escapseValues = new String[length];
+ String[] escapeValues = new String[length];
for (int i = 0; i < length; i++) {
- escapseValues[i] = values[i].replaceAll("<", "<").replaceAll(">", ">");
+ escapeValues[i] = values[i].replaceAll("<", "<").replaceAll(">", ">");
}
- return escapseValues;
+ return escapeValues;
}
- return values;
+ return null;
}
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/mapper/FrontBookMapper.java b/novel-front/src/main/java/com/java2nb/novel/mapper/FrontBookMapper.java
index f71ee81..b249821 100644
--- a/novel-front/src/main/java/com/java2nb/novel/mapper/FrontBookMapper.java
+++ b/novel-front/src/main/java/com/java2nb/novel/mapper/FrontBookMapper.java
@@ -1,11 +1,10 @@
package com.java2nb.novel.mapper;
import com.java2nb.novel.entity.Book;
-import com.java2nb.novel.search.BookSP;
+import com.java2nb.novel.vo.BookSpVO;
import com.java2nb.novel.vo.BookVO;
import org.apache.ibatis.annotations.Param;
-import java.util.Date;
import java.util.List;
/**
@@ -14,7 +13,7 @@ import java.util.List;
public interface FrontBookMapper extends BookMapper {
- List searchByPage(BookSP params);
+ List searchByPage(BookSpVO params);
void addVisitCount(@Param("bookId") Long bookId, @Param("visitCount") Integer visitCount);
diff --git a/novel-front/src/main/java/com/java2nb/novel/mapper/FrontNewsMapper.java b/novel-front/src/main/java/com/java2nb/novel/mapper/FrontNewsMapper.java
new file mode 100644
index 0000000..ad70607
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/mapper/FrontNewsMapper.java
@@ -0,0 +1,21 @@
+package com.java2nb.novel.mapper;
+
+import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.vo.BookSpVO;
+import com.java2nb.novel.vo.BookVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+public interface FrontNewsMapper extends NewsMapper {
+
+ /**
+ * 增加新闻阅读量
+ * @param newsId 新闻ID
+ * */
+ void addReadCount(@Param("newsId") Integer newsId);
+
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/page/PageController.java b/novel-front/src/main/java/com/java2nb/novel/page/PageController.java
new file mode 100644
index 0000000..44b211f
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/page/PageController.java
@@ -0,0 +1,304 @@
+package com.java2nb.novel.page;
+
+import com.java2nb.novel.controller.BaseController;
+import com.java2nb.novel.core.bean.PageBean;
+import com.java2nb.novel.core.bean.UserDetails;
+import com.java2nb.novel.core.utils.ThreadLocalUtil;
+import com.java2nb.novel.entity.*;
+import com.java2nb.novel.service.*;
+import com.java2nb.novel.vo.BookCommentVO;
+import com.java2nb.novel.vo.BookSettingVO;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * @author 11797
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Controller
+public class PageController extends BaseController {
+
+ @Value("${txt.save.path}")
+ private String fileSavePath;
+
+ private final BookService bookService;
+
+ private final NewsService newsService;
+
+ private final AuthorService authorService;
+
+ private final UserService userService;
+
+ private final BookContentService bookContentService;
+
+ private final ThreadPoolExecutor threadPoolExecutor;
+
+
+ @RequestMapping("{url}.html")
+ public String module(@PathVariable("url") String url) {
+ return url;
+ }
+
+ @RequestMapping("{module}/{url}.html")
+ public String module2(@PathVariable("module") String module, @PathVariable("url") String url, HttpServletRequest request) {
+
+ if (request.getRequestURI().startsWith("/author")) {
+ //访问作者专区
+ UserDetails user = getUserDetails(request);
+ if (user == null) {
+ //未登录
+ return "redirect:/user/login.html?originUrl=" + request.getRequestURI();
+ }
+
+ boolean isAuthor = authorService.isAuthor(user.getId());
+ if (!isAuthor) {
+ return "redirect:/author/register.html";
+ }
+ }
+
+ return module + "/" + url;
+ }
+
+ @RequestMapping("{module}/{classify}/{url}.html")
+ public String module3(@PathVariable("module") String module, @PathVariable("classify") String classify, @PathVariable("url") String url) {
+ return module + "/" + classify + "/" + url;
+ }
+
+ /**
+ * 首页
+ */
+ @SneakyThrows
+ @RequestMapping(path = {"/", "/index", "/index.html"})
+ public String index(Model model) {
+ //加载小说首页小说基本信息线程
+ CompletableFuture>> bookCompletableFuture = CompletableFuture.supplyAsync(bookService::listBookSettingVO, threadPoolExecutor);
+ //加载首页新闻线程
+ CompletableFuture> newsCompletableFuture = CompletableFuture.supplyAsync(newsService::listIndexNews, threadPoolExecutor);
+ model.addAttribute("bookMap", bookCompletableFuture.get());
+ model.addAttribute("newsList", newsCompletableFuture.get());
+ return ThreadLocalUtil.getTemplateDir() + "index";
+ }
+
+ /**
+ * 作品页
+ */
+ @RequestMapping("book/bookclass.html")
+ public String bookClass() {
+ return "book/bookclass";
+ }
+
+ /**
+ * 排行页
+ */
+ @RequestMapping("book/book_ranking.html")
+ public String bookRank() {
+
+ return ThreadLocalUtil.getTemplateDir() + "book/book_ranking";
+ }
+
+
+ /**
+ * 详情页
+ */
+ @SneakyThrows
+ @RequestMapping("/book/{bookId}.html")
+ public String bookDetail(@PathVariable("bookId") Long bookId, Model model) {
+ //加载小说基本信息线程
+ CompletableFuture bookCompletableFuture = CompletableFuture.supplyAsync(() -> {
+ //查询书籍
+ Book book = bookService.queryBookDetail(bookId);
+ log.debug("加载小说基本信息线程结束");
+ return book;
+ }, threadPoolExecutor);
+ //加载小说评论列表线程
+ CompletableFuture> bookCommentPageBeanCompletableFuture = CompletableFuture.supplyAsync(() -> {
+ PageBean bookCommentVOPageBean = bookService.listCommentByPage(null, bookId, 1, 5);
+ log.debug("加载小说评论列表线程结束");
+ return bookCommentVOPageBean;
+ }, threadPoolExecutor);
+ //加载小说首章信息线程，该线程在加载小说基本信息线程执行完毕后才执行
+ CompletableFuture firstBookIndexIdCompletableFuture = bookCompletableFuture.thenApplyAsync((book) -> {
+ if (book.getLastIndexId() != null) {
+ //查询首章目录ID
+ Long firstBookIndexId = bookService.queryFirstBookIndexId(bookId);
+ log.debug("加载小说基本信息线程结束");
+ return firstBookIndexId;
+ }
+ return null;
+ }, threadPoolExecutor);
+ //加载随机推荐小说线程，该线程在加载小说基本信息线程执行完毕后才执行
+ CompletableFuture> recBookCompletableFuture = bookCompletableFuture.thenApplyAsync((book) -> {
+ List books = bookService.listRecBookByCatId(book.getCatId());
+ log.debug("加载随机推荐小说线程结束");
+ return books;
+ }, threadPoolExecutor);
+
+
+ model.addAttribute("book", bookCompletableFuture.get());
+ model.addAttribute("firstBookIndexId", firstBookIndexIdCompletableFuture.get());
+ model.addAttribute("recBooks", recBookCompletableFuture.get());
+ model.addAttribute("bookCommentPageBean", bookCommentPageBeanCompletableFuture.get());
+
+ return ThreadLocalUtil.getTemplateDir() + "book/book_detail";
+ }
+
+ /**
+ * 目录页
+ */
+ @SneakyThrows
+ @RequestMapping("/book/indexList-{bookId}.html")
+ public String indexList(@PathVariable("bookId") Long bookId, Model model) {
+ Book book = bookService.queryBookDetail(bookId);
+ model.addAttribute("book", book);
+ List bookIndexList = bookService.queryIndexList(bookId, null, 1, null);
+ model.addAttribute("bookIndexList", bookIndexList);
+ model.addAttribute("bookIndexCount", bookIndexList.size());
+ return ThreadLocalUtil.getTemplateDir() + "book/book_index";
+ }
+
+ /**
+ * 内容页
+ */
+ @SneakyThrows
+ @RequestMapping("/book/{bookId}/{bookIndexId}.html")
+ public String bookContent(@PathVariable("bookId") Long bookId, @PathVariable("bookIndexId") Long bookIndexId, HttpServletRequest request, Model model) {
+ //加载小说基本信息线程
+ CompletableFuture bookCompletableFuture = CompletableFuture.supplyAsync(() -> {
+ //查询书籍
+ Book book = bookService.queryBookDetail(bookId);
+ log.debug("加载小说基本信息线程结束");
+ return book;
+ }, threadPoolExecutor);
+
+ //加载小说章节信息线程
+ CompletableFuture bookIndexCompletableFuture = CompletableFuture.supplyAsync(() -> {
+ //查询目录
+ BookIndex bookIndex = bookService.queryBookIndex(bookIndexId);
+ log.debug("加载小说章节信息线程结束");
+ return bookIndex;
+ }, threadPoolExecutor);
+
+ //加载小说上一章节信息线程，该线程在加载小说章节信息线程执行完毕后才执行
+ CompletableFuture preBookIndexIdCompletableFuture = bookIndexCompletableFuture.thenApplyAsync((bookIndex) -> {
+ //查询上一章节目录ID
+ Long preBookIndexId = bookService.queryPreBookIndexId(bookId, bookIndex.getIndexNum());
+ log.debug("加载小说上一章节信息线程结束");
+ return preBookIndexId;
+ }, threadPoolExecutor);
+
+ //加载小说下一章节信息线程，该线程在加载小说章节信息线程执行完毕后才执行
+ CompletableFuture nextBookIndexIdCompletableFuture = bookIndexCompletableFuture.thenApplyAsync((bookIndex) -> {
+ //查询下一章目录ID
+ Long nextBookIndexId = bookService.queryNextBookIndexId(bookId, bookIndex.getIndexNum());
+ log.debug("加载小说下一章节信息线程结束");
+ return nextBookIndexId;
+ }, threadPoolExecutor);
+
+ //加载小说内容信息线程
+ CompletableFuture bookContentCompletableFuture = CompletableFuture.supplyAsync(() -> {
+ //查询内容
+ BookContent bookContent = bookContentService.queryBookContent(bookId, bookIndexId);
+ log.debug("加载小说内容信息线程结束");
+ return bookContent;
+ }, threadPoolExecutor);
+
+
+ //判断用户是否需要购买线程，该线程在加载小说章节信息线程执行完毕后才执行
+ CompletableFuture needBuyCompletableFuture = bookIndexCompletableFuture.thenApplyAsync((bookIndex) -> {
+ //判断该目录是否收费
+ if (bookIndex.getIsVip() != null && bookIndex.getIsVip() == 1) {
+ //收费
+ UserDetails user = getUserDetails(request);
+ if (user == null) {
+ //未登录，需要购买
+ return true;
+ }
+ //判断用户是否购买过该目录
+ boolean isBuy = userService.queryIsBuyBookIndex(user.getId(), bookIndexId);
+ if (!isBuy) {
+ //没有购买过，需要购买
+ return true;
+ }
+ }
+
+ log.debug("判断用户是否需要购买线程结束");
+ return false;
+
+ }, threadPoolExecutor);
+
+
+ model.addAttribute("book", bookCompletableFuture.get());
+ model.addAttribute("bookIndex", bookIndexCompletableFuture.get());
+ model.addAttribute("preBookIndexId", preBookIndexIdCompletableFuture.get());
+ model.addAttribute("nextBookIndexId", nextBookIndexIdCompletableFuture.get());
+ model.addAttribute("bookContent", bookContentCompletableFuture.get());
+ model.addAttribute("needBuy", needBuyCompletableFuture.get());
+
+ return ThreadLocalUtil.getTemplateDir() + "book/book_content";
+ }
+
+ /**
+ * 评论页面
+ */
+ @RequestMapping("/book/comment-{bookId}.html")
+ public String commentList(@PathVariable("bookId") Long bookId, Model model) {
+ //查询书籍
+ Book book = bookService.queryBookDetail(bookId);
+ model.addAttribute("book", book);
+ return "book/book_comment";
+ }
+
+ /**
+ * 新闻内容页面
+ */
+ @RequestMapping("/about/newsInfo-{newsId}.html")
+ public String newsInfo(@PathVariable("newsId") Long newsId, Model model) {
+ //查询新闻
+ News news = newsService.queryNewsInfo(newsId);
+ model.addAttribute("news", news);
+ return "about/news_info";
+ }
+
+
+ /**
+ * 作者注册页面
+ */
+ @RequestMapping("author/register.html")
+ public String authorRegister(Author author, HttpServletRequest request, Model model) {
+ UserDetails user = getUserDetails(request);
+ if (user == null) {
+ //未登录
+ return "redirect:/user/login.html?originUrl=/author/register.html";
+ }
+
+ if (StringUtils.isNotBlank(author.getInviteCode())) {
+ //提交作者注册信息
+ String errorInfo = authorService.register(user.getId(), author);
+ if (StringUtils.isBlank(errorInfo)) {
+ //注册成功
+ return "redirect:/author/index.html";
+ }
+ model.addAttribute("LabErr", errorInfo);
+ model.addAttribute("author", author);
+ }
+ return "author/register";
+ }
+
+
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java b/novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java
index fae2dbe..3c5437c 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java
@@ -1,10 +1,10 @@
package com.java2nb.novel.service;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.entity.Author;
import com.java2nb.novel.entity.AuthorIncome;
import com.java2nb.novel.entity.AuthorIncomeDetail;
-import com.java2nb.novel.entity.FriendLink;
import java.util.Date;
import java.util.List;
@@ -111,9 +111,9 @@ public interface AuthorService {
* @param bookId 小说ID
* @param startTime 开始时间
* @param endTime 结束时间
- * @return 日收入统计数据列表
+ * @return 日收入统计数据分页数据
*/
- List listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime);
+ PageBean listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime);
/**
@@ -122,7 +122,7 @@ public interface AuthorService {
* @param pageSize 分页大小
* @param userId 用户ID
* @param bookId 小说ID
- * @return
+ * @return 分页数据
* */
- List listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId);
+ PageBean listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/BookContentService.java b/novel-front/src/main/java/com/java2nb/novel/service/BookContentService.java
new file mode 100644
index 0000000..a610fab
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/service/BookContentService.java
@@ -0,0 +1,11 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.entity.BookContent;
+
+import java.util.List;
+
+public interface BookContentService {
+
+ BookContent queryBookContent(Long bookId, Long bookIndexId);
+
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/BookService.java b/novel-front/src/main/java/com/java2nb/novel/service/BookService.java
index ced701e..36b279e 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/BookService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/BookService.java
@@ -1,11 +1,11 @@
package com.java2nb.novel.service;
-import com.github.pagehelper.PageInfo;
-import com.java2nb.novel.search.BookSP;
+import com.java2nb.novel.core.bean.PageBean;
+import com.java2nb.novel.entity.*;
import com.java2nb.novel.vo.BookCommentVO;
import com.java2nb.novel.vo.BookSettingVO;
-import com.java2nb.novel.entity.*;
+import com.java2nb.novel.vo.BookSpVO;
import com.java2nb.novel.vo.BookVO;
import java.util.Date;
@@ -31,7 +31,7 @@ public interface BookService {
/**
* 查询首页新书榜单数据
- * @return
+ * @return 小说列表
* */
List listNewRank();
@@ -48,7 +48,7 @@ public interface BookService {
* @param pageSize 分页大小
* @return 小说集合分页信息
* */
- PageInfo searchByPage(BookSP params, int page, int pageSize);
+ PageBean searchByPage(BookSpVO params, int page, int pageSize);
/**
* 查询小说分类列表
@@ -101,6 +101,7 @@ public interface BookService {
* @param bookIndexId 目录ID
* @return 书籍内容
* */
+ @Deprecated
BookContent queryBookContent(Long bookIndexId);
/**
@@ -114,7 +115,8 @@ public interface BookService {
/**
* 增加点击次数
* @param bookId 书籍ID
- * @param visitCount*/
+ * @param visitCount 点击量
+ * */
void addVisitCount(Long bookId, Integer visitCount);
/**
@@ -144,9 +146,9 @@ public interface BookService {
* @param bookId 书籍ID
* @param page 页码
* @param pageSize 分页大小
- * @return 评论集合
+ * @return 评论分页数据
* */
- List listCommentByPage(Long userId, Long bookId, int page, int pageSize);
+ PageBean listCommentByPage(Long userId, Long bookId, int page, int pageSize);
/**
* 新增评价
@@ -161,6 +163,7 @@ public interface BookService {
* @param workDirection 作品方向
* @return 作者ID
* */
+ @Deprecated
Long getOrCreateAuthorIdByName(String authorName, Byte workDirection);
@@ -178,6 +181,7 @@ public interface BookService {
* @param bookId 小说ID
* @return 目录号集合
* */
+ @Deprecated
List queryIndexNumByBookId(Long bookId);
/**
@@ -202,9 +206,9 @@ public interface BookService {
* @param userId 用户ID
* @param page 页码
* @param pageSize 分页大小
- * @return 小说集合
+ * @return 小说分页数据
* */
- List listBookPageByUserId(Long userId, int page, int pageSize);
+ PageBean listBookPageByUserId(Long userId, int page, int pageSize);
/**
* 发布小说
@@ -278,4 +282,12 @@ public interface BookService {
* @param authorId
*/
void updateBookContent( Long indexId, String indexName, String content, Long authorId);
+
+ /**
+ * 修改小说封面
+ * @param bookId
+ * @param bookPic
+ * @param authorId
+ */
+ void updateBookPic(Long bookId, String bookPic, Long authorId);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/NewsService.java b/novel-front/src/main/java/com/java2nb/novel/service/NewsService.java
index 72ea687..719a0e5 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/NewsService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/NewsService.java
@@ -1,6 +1,7 @@
package com.java2nb.novel.service;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.entity.News;
import com.java2nb.novel.vo.NewsVO;
@@ -28,7 +29,13 @@ public interface NewsService {
* 分页查询新闻列表
* @param page 页码
* @param pageSize 分页大小
- * @return 新闻集合
+ * @return 新闻分页数据
* */
- List listByPage(int page, int pageSize);
+ PageBean listByPage(int page, int pageSize);
+
+ /**
+ * 增加新闻阅读量
+ * @param newsId 新闻ID
+ * */
+ void addReadCount(Integer newsId);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/SearchService.java b/novel-front/src/main/java/com/java2nb/novel/service/SearchService.java
index 381315c..52f1521 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/SearchService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/SearchService.java
@@ -2,8 +2,11 @@ package com.java2nb.novel.service;
import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.entity.Book;
-import com.java2nb.novel.search.BookSP;
+import com.java2nb.novel.vo.BookSpVO;
+import com.java2nb.novel.vo.BookVO;
+import com.java2nb.novel.vo.EsBookVO;
/**
* @author 11797
@@ -23,5 +26,5 @@ public interface SearchService {
* @param pageSize 每页大小
* @return 分页信息
*/
- PageInfo searchBook(BookSP params, int page, int pageSize);
+ PageBean searchBook(BookSpVO params, int page, int pageSize);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/UserService.java b/novel-front/src/main/java/com/java2nb/novel/service/UserService.java
index 8d08a57..9826e6e 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/UserService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/UserService.java
@@ -1,8 +1,10 @@
package com.java2nb.novel.service;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.bean.UserDetails;
import com.java2nb.novel.entity.UserBuyRecord;
+import com.java2nb.novel.entity.UserFeedback;
import com.java2nb.novel.vo.BookReadHistoryVO;
import com.java2nb.novel.vo.BookShelfVO;
import com.java2nb.novel.entity.User;
@@ -58,9 +60,9 @@ public interface UserService {
* @param userId 用户ID
* @param page
* @param pageSize
- * @return 书架集合
+ * @return 书架分页信息
* */
- List listBookShelfByPage(Long userId, int page, int pageSize);
+ PageBean listBookShelfByPage(Long userId, int page, int pageSize);
/**
* 添加阅读记录
@@ -82,9 +84,9 @@ public interface UserService {
* @param userId 用户ID
* @param page 页码
* @param pageSize 分页大小
- * @return 反馈集合
+ * @return 反馈分页数据
* */
- List listUserFeedBackByPage(Long userId, int page, int pageSize);
+ PageBean listUserFeedBackByPage(Long userId, int page, int pageSize);
/**
* 查询个人信息
@@ -98,9 +100,9 @@ public interface UserService {
* @param userId 用户id
* @param page 页码
* @param pageSize 分页大小
- * @return
+ * @return 分页数据
* */
- List listReadHistoryByPage(Long userId, int page, int pageSize);
+ PageBean listReadHistoryByPage(Long userId, int page, int pageSize);
/**
* 更新个人信息
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java
index 29881fd..5e8b31d 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java
@@ -1,6 +1,7 @@
package com.java2nb.novel.service.impl;
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.enums.ResponseStatus;
@@ -170,9 +171,9 @@ public class AuthorServiceImpl implements AuthorService {
@Override
- public List listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime) {
+ public PageBean listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime) {
PageHelper.startPage(page, pageSize);
- return authorIncomeDetailMapper.selectMany(
+ return new PageBean<>(authorIncomeDetailMapper.selectMany(
select(AuthorIncomeDetailDynamicSqlSupport.incomeDate, AuthorIncomeDetailDynamicSqlSupport.incomeAccount
, AuthorIncomeDetailDynamicSqlSupport.incomeCount, AuthorIncomeDetailDynamicSqlSupport.incomeNumber)
.from(AuthorIncomeDetailDynamicSqlSupport.authorIncomeDetail)
@@ -182,14 +183,14 @@ public class AuthorServiceImpl implements AuthorService {
.and(AuthorIncomeDetailDynamicSqlSupport.incomeDate, isLessThanOrEqualTo(endTime))
.orderBy(AuthorIncomeDetailDynamicSqlSupport.incomeDate.descending())
.build()
- .render(RenderingStrategies.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3)));
}
@Override
- public List listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId) {
+ public PageBean listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId) {
PageHelper.startPage(page, pageSize);
- return authorIncomeMapper.selectMany(select(AuthorIncomeDynamicSqlSupport.incomeMonth
+ return new PageBean<>(authorIncomeMapper.selectMany(select(AuthorIncomeDynamicSqlSupport.incomeMonth
, AuthorIncomeDynamicSqlSupport.preTaxIncome
, AuthorIncomeDynamicSqlSupport.afterTaxIncome
, AuthorIncomeDynamicSqlSupport.payStatus
@@ -199,6 +200,6 @@ public class AuthorServiceImpl implements AuthorService {
.and(AuthorIncomeDynamicSqlSupport.bookId, isEqualTo(bookId))
.orderBy(AuthorIncomeDynamicSqlSupport.incomeMonth.descending())
.build()
- .render(RenderingStrategies.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3)));
}
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
index baae58b..dd1db5d 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
@@ -2,23 +2,26 @@ package com.java2nb.novel.service.impl;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
+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.config.BookPriceConfig;
+import com.java2nb.novel.core.config.BookPriceProperties;
import com.java2nb.novel.core.enums.ResponseStatus;
import com.java2nb.novel.core.exception.BusinessException;
-import com.java2nb.novel.core.utils.*;
-import com.java2nb.novel.entity.*;
+import com.java2nb.novel.core.utils.BeanUtil;
+import com.java2nb.novel.core.utils.Constants;
+import com.java2nb.novel.core.utils.IdWorker;
+import com.java2nb.novel.core.utils.StringUtil;
import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.entity.*;
import com.java2nb.novel.mapper.*;
-import com.java2nb.novel.search.BookSP;
import com.java2nb.novel.service.AuthorService;
import com.java2nb.novel.service.BookService;
import com.java2nb.novel.service.FileService;
import com.java2nb.novel.service.SearchService;
import com.java2nb.novel.vo.BookCommentVO;
import com.java2nb.novel.vo.BookSettingVO;
+import com.java2nb.novel.vo.BookSpVO;
import com.java2nb.novel.vo.BookVO;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -26,7 +29,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.mybatis.dynamic.sql.SortSpecification;
import org.mybatis.dynamic.sql.render.RenderingStrategies;
-import org.mybatis.dynamic.sql.render.RenderingStrategy;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -35,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.orderbyhelper.OrderByHelper;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -89,7 +92,7 @@ public class BookServiceImpl implements BookService {
private final FileService fileService;
- private final BookPriceConfig bookPriceConfig;
+ private final BookPriceProperties bookPriceConfig;
@SneakyThrows
@@ -125,9 +128,9 @@ public class BookServiceImpl implements BookService {
type = 0;
} else if (i < 14) {
type = 1;
- } else if (i < 20) {
+ } else if (i < 19) {
type = 2;
- } else if (i < 26) {
+ } else if (i < 25) {
type = 3;
} else {
type = 4;
@@ -186,7 +189,7 @@ public class BookServiceImpl implements BookService {
}
@Override
- public PageInfo searchByPage(BookSP params, int page, int pageSize) {
+ public PageBean searchByPage(BookSpVO params, int page, int pageSize) {
if (params.getUpdatePeriod() != null) {
@@ -213,7 +216,7 @@ public class BookServiceImpl implements BookService {
if (StringUtils.isNotBlank(params.getSort())) {
OrderByHelper.orderBy(params.getSort() + " desc");
}
- return new PageInfo<>(bookMapper.searchByPage(params));
+ return new PageBean<>(bookMapper.searchByPage(params));
}
@@ -382,10 +385,10 @@ public class BookServiceImpl implements BookService {
}
@Override
- public List listCommentByPage(Long userId, Long bookId, int page, int pageSize) {
+ public PageBean listCommentByPage(Long userId, Long bookId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
OrderByHelper.orderBy("t1.create_time desc");
- return bookCommentMapper.listCommentByPage(userId, bookId);
+ return new PageBean<>(bookCommentMapper.listCommentByPage(userId, bookId));
}
@Transactional(rollbackFor = Exception.class)
@@ -491,7 +494,7 @@ public class BookServiceImpl implements BookService {
}
@Override
- public List listBookPageByUserId(Long userId, int page, int pageSize) {
+ public PageBean listBookPageByUserId(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
@@ -501,7 +504,7 @@ public class BookServiceImpl implements BookService {
.orderBy(BookDynamicSqlSupport.createTime.descending())
.build()
.render(RenderingStrategies.MYBATIS3);
- return bookMapper.selectMany(selectStatement);
+ return new PageBean<>(bookMapper.selectMany(selectStatement));
}
@@ -512,7 +515,6 @@ public class BookServiceImpl implements BookService {
//该作者发布过此书名的小说
throw new BusinessException(ResponseStatus.BOOKNAME_EXISTS);
}
- ;
book.setAuthorName(penName);
book.setAuthorId(authorId);
book.setVisitCount(0L);
@@ -565,7 +567,7 @@ public class BookServiceImpl implements BookService {
.render(RenderingStrategies.MYBATIS3));
//计算价格
- int bookPrice = new BigDecimal(wordCount).divide(bookPriceConfig.getWordCount()).multiply(bookPriceConfig.getValue()).intValue();
+ int bookPrice = new BigDecimal(wordCount).multiply(bookPriceConfig.getValue()).divide(bookPriceConfig.getWordCount(),0, RoundingMode.DOWN).intValue();
//更新小说目录表
int indexNum = 0;
@@ -600,6 +602,7 @@ public class BookServiceImpl implements BookService {
return bookMapper.selectMany(select(book.allColumns())
.from(book)
.where(updateTime, isGreaterThan(startDate))
+ .and(lastIndexId,isNotNull())
.orderBy(updateTime)
.limit(limit)
.build()
@@ -624,7 +627,7 @@ public class BookServiceImpl implements BookService {
List bookIndices = bookIndexMapper.selectMany(
select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
.from(bookIndex)
- .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+ .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategies.MYBATIS3));
if (bookIndices.size() > 0) {
BookIndex bookIndex = bookIndices.get(0);
//获取小说ID
@@ -635,7 +638,7 @@ public class BookServiceImpl implements BookService {
.from(book)
.where(id, isEqualTo(bookId))
.build()
- .render(RenderingStrategy.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3));
if (books.size() > 0) {
Book book = books.get(0);
int wordCount = book.getWordCount();
@@ -658,7 +661,7 @@ public class BookServiceImpl implements BookService {
.orderBy(BookIndexDynamicSqlSupport.indexNum.descending())
.limit(1)
.build()
- .render(RenderingStrategy.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3));
if (lastBookIndices.size() > 0) {
BookIndex lastBookIndex = lastBookIndices.get(0);
lastIndexId = lastBookIndex.getId();
@@ -698,7 +701,7 @@ public class BookServiceImpl implements BookService {
List bookIndices = bookIndexMapper.selectMany(
select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
.from(bookIndex)
- .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+ .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategies.MYBATIS3));
if (bookIndices.size() > 0) {
BookIndex bookIndex = bookIndices.get(0);
//获取小说ID
@@ -709,7 +712,7 @@ public class BookServiceImpl implements BookService {
.from(book)
.where(id, isEqualTo(bookId))
.build()
- .render(RenderingStrategy.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3));
if (books.size() > 0) {
Book book = books.get(0);
//作者ID相同，表明该小说是登录用户发布，可以修改
@@ -723,7 +726,7 @@ public class BookServiceImpl implements BookService {
.equalTo(new Date())
.where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId))
.build()
- .render(RenderingStrategy.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3));
}
@@ -739,7 +742,7 @@ public class BookServiceImpl implements BookService {
List bookIndices = bookIndexMapper.selectMany(
select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
.from(bookIndex)
- .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+ .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategies.MYBATIS3));
if (bookIndices.size() > 0) {
BookIndex bookIndex = bookIndices.get(0);
//获取小说ID
@@ -750,7 +753,7 @@ public class BookServiceImpl implements BookService {
.from(book)
.where(id, isEqualTo(bookId))
.build()
- .render(RenderingStrategy.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3));
if (books.size() > 0) {
Book book = books.get(0);
//作者ID相同，表明该小说是登录用户发布
@@ -760,7 +763,7 @@ public class BookServiceImpl implements BookService {
.from(bookContent)
.where(BookContentDynamicSqlSupport.indexId, isEqualTo(indexId))
.limit(1)
- .build().render(RenderingStrategy.MYBATIS3))
+ .build().render(RenderingStrategies.MYBATIS3))
.get(0).getContent();
}
@@ -777,7 +780,7 @@ public class BookServiceImpl implements BookService {
List bookIndices = bookIndexMapper.selectMany(
select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
.from(bookIndex)
- .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+ .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategies.MYBATIS3));
if (bookIndices.size() > 0) {
BookIndex bookIndex = bookIndices.get(0);
//获取小说ID
@@ -788,7 +791,7 @@ public class BookServiceImpl implements BookService {
.from(book)
.where(id, isEqualTo(bookId))
.build()
- .render(RenderingStrategy.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3));
if (books.size() > 0) {
Book book = books.get(0);
//作者ID相同，表明该小说是登录用户发布，可以修改
@@ -797,11 +800,11 @@ public class BookServiceImpl implements BookService {
int wordCount = StringUtil.getStrValidWordCount(content);
//计算价格
- int bookPrice = new BigDecimal(wordCount).divide(bookPriceConfig.getWordCount()).multiply(bookPriceConfig.getValue()).intValue();
+ int bookPrice = new BigDecimal(wordCount).multiply(bookPriceConfig.getValue()).divide(bookPriceConfig.getWordCount(),0,RoundingMode.DOWN).intValue();
//更新小说目录表
- int update = bookIndexMapper.update(
+ bookIndexMapper.update(
update(BookIndexDynamicSqlSupport.bookIndex)
.set(BookIndexDynamicSqlSupport.indexName)
.equalTo(indexName)
@@ -812,7 +815,7 @@ public class BookServiceImpl implements BookService {
.set(BookIndexDynamicSqlSupport.updateTime)
.equalTo(currentDate)
.where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId))
- .build().render(RenderingStrategy.MYBATIS3));
+ .build().render(RenderingStrategies.MYBATIS3));
//更新小说内容表
bookContentMapper.update(
@@ -820,7 +823,7 @@ public class BookServiceImpl implements BookService {
.set(BookContentDynamicSqlSupport.content)
.equalTo(content)
.where(BookContentDynamicSqlSupport.indexId, isEqualTo(indexId))
- .build().render(RenderingStrategy.MYBATIS3));
+ .build().render(RenderingStrategies.MYBATIS3));
}
}
@@ -828,5 +831,18 @@ public class BookServiceImpl implements BookService {
}
}
+ @Override
+ public void updateBookPic(Long bookId, String bookPic, Long authorId) {
+ bookMapper.update(update(book)
+ .set(picUrl)
+ .equalTo(bookPic)
+ .set(updateTime)
+ .equalTo(new Date())
+ .where(id, isEqualTo(bookId))
+ .and(BookDynamicSqlSupport.authorId, isEqualTo(authorId))
+ .build()
+ .render(RenderingStrategies.MYBATIS3));
+ }
+
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java
new file mode 100644
index 0000000..bf5e008
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/DbBookContentServiceImpl.java
@@ -0,0 +1,38 @@
+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.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.bookContent;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+import static org.mybatis.dynamic.sql.SqlBuilder.update;
+import static org.mybatis.dynamic.sql.select.SelectDSL.select;
+
+
+@Service
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "txt.save", name = "storage", havingValue = "db")
+public class DbBookContentServiceImpl implements BookContentService {
+
+ private final BookContentMapper bookContentMapper;
+
+ @Override
+ public BookContent queryBookContent(Long bookId, Long bookIndexId) {
+ SelectStatementProvider selectStatement = select(BookContentDynamicSqlSupport.id, BookContentDynamicSqlSupport.content)
+ .from(bookContent)
+ .where(BookContentDynamicSqlSupport.indexId, isEqualTo(bookIndexId))
+ .limit(1)
+ .build()
+ .render(RenderingStrategies.MYBATIS3);
+ return bookContentMapper.selectMany(selectStatement).get(0);
+ }
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java
new file mode 100644
index 0000000..aa59320
--- /dev/null
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/FileBookContentServiceImpl.java
@@ -0,0 +1,39 @@
+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 lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+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;
+
+ @SneakyThrows
+ @Override
+ public BookContent queryBookContent(Long bookId, Long bookIndexId) {
+ BufferedReader in = new BufferedReader(new FileReader(fileSavePath + "/" + bookId + "/" + bookIndexId + ".txt"));
+ StringBuffer sb = new StringBuffer();
+ String str;
+ while ((str = in.readLine()) != null) {
+ sb.append(str);
+ }
+ in.close();
+ return new BookContent() {{
+ setIndexId(bookIndexId);
+ setContent(sb.toString());
+ }};
+ }
+}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java
index 6507243..ea75678 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java
@@ -1,7 +1,9 @@
package com.java2nb.novel.service.impl;
import com.github.pagehelper.PageHelper;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.utils.BeanUtil;
+import com.java2nb.novel.mapper.FrontNewsMapper;
import com.java2nb.novel.service.NewsService;
import com.java2nb.novel.core.cache.CacheKey;
import com.java2nb.novel.core.cache.CacheService;
@@ -26,7 +28,7 @@ import static org.mybatis.dynamic.sql.select.SelectDSL.select;
@RequiredArgsConstructor
public class NewsServiceImpl implements NewsService {
- private final NewsMapper newsMapper;
+ private final FrontNewsMapper newsMapper;
private final CacheService cacheService;
@@ -35,7 +37,7 @@ public class NewsServiceImpl implements NewsService {
public List listIndexNews() {
List result = (List) cacheService.getObject(CacheKey.INDEX_NEWS_KEY);
if(result == null || result.size() == 0) {
- SelectStatementProvider selectStatement = select(id, catName, catId, title)
+ SelectStatementProvider selectStatement = select(id, catName, catId, title,createTime)
.from(news)
.orderBy(createTime.descending())
.limit(2)
@@ -59,14 +61,21 @@ public class NewsServiceImpl implements NewsService {
}
@Override
- public List listByPage(int page, int pageSize) {
+ public PageBean listByPage(int page, int pageSize) {
PageHelper.startPage(page,pageSize);
SelectStatementProvider selectStatement = select(id, catName, catId, title,createTime)
.from(news)
.orderBy(createTime.descending())
.build()
.render(RenderingStrategies.MYBATIS3);
+ List news = newsMapper.selectMany(selectStatement);
+ PageBean pageBean = new PageBean<>(news);
+ pageBean.setList(BeanUtil.copyList(news,NewsVO.class));
+ return pageBean;
+ }
- return BeanUtil.copyList(newsMapper.selectMany(selectStatement),NewsVO.class);
+ @Override
+ public void addReadCount(Integer newsId) {
+ newsMapper.addReadCount(newsId);
}
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
index 2bdd404..b77e7a6 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
@@ -3,19 +3,29 @@ package com.java2nb.novel.service.impl;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.enums.ResponseStatus;
import com.java2nb.novel.core.exception.BusinessException;
import com.java2nb.novel.core.utils.StringUtil;
import com.java2nb.novel.entity.Book;
-import com.java2nb.novel.search.BookSP;
+import com.java2nb.novel.vo.BookSpVO;
import com.java2nb.novel.service.SearchService;
+import com.java2nb.novel.vo.BookVO;
import com.java2nb.novel.vo.EsBookVO;
import io.searchbox.client.JestClient;
-import io.searchbox.core.*;
+import io.searchbox.core.Count;
+import io.searchbox.core.CountResult;
+import io.searchbox.core.Search;
+import io.searchbox.core.SearchResult;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -37,12 +47,12 @@ import java.util.Map;
@Slf4j
public class SearchServiceImpl implements SearchService {
- private final String INDEX = "novel";
-
- private final String TYPE = "book";
-
private final JestClient jestClient;
+ private final RestHighLevelClient restHighLevelClient;
+
+ private final String INDEX = "novel";
+
@Override
@SneakyThrows
@@ -51,16 +61,19 @@ public class SearchServiceImpl implements SearchService {
EsBookVO esBookVO = new EsBookVO();
BeanUtils.copyProperties(book, esBookVO, "lastIndexUpdateTime");
esBookVO.setLastIndexUpdateTime(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(book.getLastIndexUpdateTime()));
- Index action = new Index.Builder(esBookVO).index(INDEX).type(TYPE).id(book.getId().toString()).build();
- jestClient.execute(action);
+ IndexRequest request = new IndexRequest(INDEX);
+ request.id(book.getId()+"");
+ request.source(new ObjectMapper().writeValueAsString(esBookVO), XContentType.JSON);
+ IndexResponse index = restHighLevelClient.index(request, RequestOptions.DEFAULT);
+ log.debug(index.getResult().toString());
}
@SneakyThrows
@Override
- public PageInfo searchBook(BookSP params, int page, int pageSize) {
+ public PageBean searchBook(BookSpVO params, int page, int pageSize) {
List bookList = new ArrayList<>(0);
//使用搜索引擎搜索
@@ -102,7 +115,7 @@ public class SearchServiceImpl implements SearchService {
searchSourceBuilder.query(boolQueryBuilder);
- Count count = new Count.Builder().addIndex(INDEX).addType(TYPE)
+ Count count = new Count.Builder().addIndex(INDEX)
.query(searchSourceBuilder.toString()).build();
CountResult results = jestClient.execute(count);
Double total = results.getCount();
@@ -130,7 +143,7 @@ public class SearchServiceImpl implements SearchService {
searchSourceBuilder.size(pageSize);
// 构建Search对象
- Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex(INDEX).addType(TYPE).build();
+ Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex(INDEX).build();
log.debug(search.toString());
SearchResult result;
result = jestClient.execute(search);
@@ -188,11 +201,7 @@ public class SearchServiceImpl implements SearchService {
}
}
- PageInfo pageInfo = new PageInfo<>(bookList);
- pageInfo.setTotal(total.longValue());
- pageInfo.setPageNum(page);
- pageInfo.setPageSize(pageSize);
- return pageInfo;
+ return new PageBean<>(page,pageSize,total.longValue(),bookList);
}
throw new BusinessException(ResponseStatus.ES_SEARCH_FAIL);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
index 6b85319..e3b971a 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
@@ -1,6 +1,7 @@
package com.java2nb.novel.service.impl;
import com.github.pagehelper.PageHelper;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.bean.UserDetails;
import com.java2nb.novel.core.utils.BeanUtil;
import com.java2nb.novel.entity.*;
@@ -147,9 +148,9 @@ public class UserServiceImpl implements UserService {
}
@Override
- public List listBookShelfByPage(Long userId, int page, int pageSize) {
+ public PageBean listBookShelfByPage(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
- return userBookshelfMapper.listBookShelf(userId);
+ return new PageBean<>(userBookshelfMapper.listBookShelf(userId));
}
@Transactional(rollbackFor = Exception.class)
@@ -201,7 +202,7 @@ public class UserServiceImpl implements UserService {
}
@Override
- public List listUserFeedBackByPage(Long userId, int page, int pageSize) {
+ public PageBean listUserFeedBackByPage(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
SelectStatementProvider selectStatement = select(UserFeedbackDynamicSqlSupport.content, UserFeedbackDynamicSqlSupport.createTime)
.from(userFeedback)
@@ -209,7 +210,10 @@ public class UserServiceImpl implements UserService {
.orderBy(UserFeedbackDynamicSqlSupport.id.descending())
.build()
.render(RenderingStrategies.MYBATIS3);
- return BeanUtil.copyList(userFeedbackMapper.selectMany(selectStatement),UserFeedbackVO.class);
+ List userFeedbacks = userFeedbackMapper.selectMany(selectStatement);
+ PageBean pageBean = new PageBean<>(userFeedbacks);
+ pageBean.setList(BeanUtil.copyList(userFeedbacks,UserFeedbackVO.class));
+ return pageBean;
}
@Override
@@ -223,9 +227,9 @@ public class UserServiceImpl implements UserService {
}
@Override
- public List listReadHistoryByPage(Long userId, int page, int pageSize) {
+ public PageBean listReadHistoryByPage(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
- return userReadHistoryMapper.listReadHistory(userId);
+ return new PageBean<>(userReadHistoryMapper.listReadHistory(userId));
}
@Override
diff --git a/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java b/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java
index 56a23ce..5b1e3c4 100644
--- a/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java
+++ b/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java
@@ -1,6 +1,8 @@
package com.java2nb.novel.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.java2nb.novel.core.serialize.CommentUserNameSerialize;
import com.java2nb.novel.entity.BookComment;
import lombok.Data;
@@ -13,6 +15,7 @@ import java.util.Date;
@Data
public class BookCommentVO extends BookComment {
+ @JsonSerialize(using = CommentUserNameSerialize.class)
private String createUserName;
private String createUserPhoto;
diff --git a/novel-front/src/main/java/com/java2nb/novel/vo/BookSettingVO.java b/novel-front/src/main/java/com/java2nb/novel/vo/BookSettingVO.java
index 80a72aa..f6de25f 100644
--- a/novel-front/src/main/java/com/java2nb/novel/vo/BookSettingVO.java
+++ b/novel-front/src/main/java/com/java2nb/novel/vo/BookSettingVO.java
@@ -21,6 +21,12 @@ public class BookSettingVO extends BookSetting implements Serializable {
private Float score;
+ private Integer catId;
+
+ private String catName;
+
+ private Byte bookStatus;
+
@Override
public String toString() {
diff --git a/novel-front/src/main/java/com/java2nb/novel/search/BookSP.java b/novel-front/src/main/java/com/java2nb/novel/vo/BookSpVO.java
similarity index 88%
rename from novel-front/src/main/java/com/java2nb/novel/search/BookSP.java
rename to novel-front/src/main/java/com/java2nb/novel/vo/BookSpVO.java
index 04dcdcb..5bf6400 100644
--- a/novel-front/src/main/java/com/java2nb/novel/search/BookSP.java
+++ b/novel-front/src/main/java/com/java2nb/novel/vo/BookSpVO.java
@@ -1,4 +1,4 @@
-package com.java2nb.novel.search;
+package com.java2nb.novel.vo;
import lombok.Data;
@@ -9,7 +9,7 @@ import java.util.Date;
* @author 11797
*/
@Data
-public class BookSP {
+public class BookSpVO {
private String keyword;
diff --git a/novel-front/src/main/java/com/java2nb/novel/vo/EsBookVO.java b/novel-front/src/main/java/com/java2nb/novel/vo/EsBookVO.java
index 55c5a41..2597a14 100644
--- a/novel-front/src/main/java/com/java2nb/novel/vo/EsBookVO.java
+++ b/novel-front/src/main/java/com/java2nb/novel/vo/EsBookVO.java
@@ -1,13 +1,7 @@
package com.java2nb.novel.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.java2nb.novel.entity.Book;
import lombok.Data;
-import javax.annotation.Generated;
-import java.io.Serializable;
-import java.util.Date;
-
/**
* @author Administrator
*/
diff --git a/novel-front/src/main/resources/application-dev.yml b/novel-front/src/main/resources/application-dev.yml
index 4ea9fe8..83ae91e 100644
--- a/novel-front/src/main/resources/application-dev.yml
+++ b/novel-front/src/main/resources/application-dev.yml
@@ -1,3 +1,24 @@
spring:
- profiles:
- include: [common-dev]
\ No newline at end of file
+ profiles:
+ include: [common-dev]
+
+
+pic:
+ save:
+ type: 1 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
+ storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
+ path: /Users/xiongxiaoyang/java #图片保存路径
+
+
+
+#线程池配置
+thread:
+ pool:
+ #核心线程池数量
+ core-pool-size: 10
+ #最大线程池数量
+ maximum-pool-size: 20
+ #线程超时时间（秒）
+ keep-alive-time: 10
+ #队列大小
+ queue-size: 100
\ No newline at end of file
diff --git a/novel-front/src/main/resources/application-prod.yml b/novel-front/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..2e83d60
--- /dev/null
+++ b/novel-front/src/main/resources/application-prod.yml
@@ -0,0 +1,37 @@
+spring:
+ profiles:
+ include: [common-prod]
+
+ #静态文件路径配置
+ resources:
+ static-locations: file:${user.dir}/templates/${templates.name}/static/
+ #thymeleaf模版路径配置
+ thymeleaf:
+ prefix: file:${user.dir}/templates/${templates.name}/html/
+ suffix: .html
+
+#模版配置
+templates:
+ name: orange
+
+
+pic:
+ save:
+ type: 2 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
+ storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
+ path: /var/pic #图片保存路径
+
+
+#线程池配置
+thread:
+ pool:
+ #核心线程池数量
+ core-pool-size: 10
+ #最大线程池数量
+ maximum-pool-size: 20
+ #线程超时时间（秒）
+ keep-alive-time: 10
+ #队列大小
+ queue-size: 1000
+
+
diff --git a/novel-front/src/main/resources/application-test.yml b/novel-front/src/main/resources/application-test.yml
deleted file mode 100644
index 1d1a43f..0000000
--- a/novel-front/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-spring:
- profiles:
- include: [common-test]
\ No newline at end of file
diff --git a/novel-front/src/main/resources/application-website.yml b/novel-front/src/main/resources/application-website.yml
new file mode 100644
index 0000000..4019d18
--- /dev/null
+++ b/novel-front/src/main/resources/application-website.yml
@@ -0,0 +1,12 @@
+#网站配置
+website:
+ #网站名
+ name: 小说精品屋
+ #域名
+ domain: xiongxyang.gitee.io
+ #SEO关键词
+ keyword: ${website.name},小说,小说CMS,原创文学系统,开源小说系统,免费小说建站程序
+ #SEO描述
+ description: ${website.name}是一个多端（PC、WAP）阅读、功能完善的原创文学CMS系统，由前台门户系统、作家后台管理系统、平台后台管理系统、爬虫管理系统等多个子系统构成，支持会员充值、订阅模式、新闻发布和实时统计报表等功能，新书自动入库，老书自动更新。
+ #联系QQ
+ qq: 1179705413
diff --git a/novel-front/src/main/resources/application.yml b/novel-front/src/main/resources/application.yml
index 6129ef3..d919598 100644
--- a/novel-front/src/main/resources/application.yml
+++ b/novel-front/src/main/resources/application.yml
@@ -4,7 +4,7 @@ server:
spring:
profiles:
active: dev
- include: alipay,oss,fastdfs
+ include: website,alipay,oss,fastdfs
rabbitmq:
@@ -23,7 +23,9 @@ spring:
#是否开启搜索引擎，1：开启，0：不开启
enable: 0
jest:
- uris: http://127.0.0.1:9200
+ uris: http://192.168.0.105:9200
+
+
redisson:
singleServerConfig:
@@ -46,7 +48,7 @@ xss:
# 排除链接（多个用逗号分隔）
excludes: /system/notice/*
# 匹配链接 （多个用逗号分隔）
- urlPatterns: /book/addBookComment,/user/addFeedBack,/author/addBook,/author/addBookContent,/author/register.html
+ urlPatterns: /book/addBookComment,/user/addFeedBack,/author/addBook,/author/addBookContent,/author/updateBookContent,/author/register.html
author:
@@ -64,4 +66,12 @@ book:
#字数
word-count: 1000
#价值(屋币)
- value: 5
\ No newline at end of file
+ value: 5
+
+
+
+
+
+
+
+
diff --git a/novel-front/src/main/resources/messages.properties b/novel-front/src/main/resources/messages.properties
deleted file mode 100644
index 7a8a983..0000000
--- a/novel-front/src/main/resources/messages.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#网站配置
-#网站名
-website.name=小说精品屋
-#PC站网站域名
-website.domain=www.java2nb.com
diff --git a/novel-front/src/main/resources/mybatis/mapping/BookMapper.xml b/novel-front/src/main/resources/mybatis/mapping/BookMapper.xml
index dfc1171..dae223a 100644
--- a/novel-front/src/main/resources/mybatis/mapping/BookMapper.xml
+++ b/novel-front/src/main/resources/mybatis/mapping/BookMapper.xml
@@ -3,7 +3,7 @@
- 
+ 
2. 小说列表页
- 
+ 
3. 小说详情页
- 
+ 
4. 小说阅读页
- 
+ 
-#### 爬虫管理系统截图
+##### 爬虫管理系统截图
-#### 后台管理系统截图
+##### 后台管理系统截图
@@ -172,30 +183,97 @@ novel-plus -- 父工程
-#### 安装步骤
+#### 深色主题模版截图
+##### PC站截图
+
+1. 首页
+
+ 
+
+##### 手机站截图
+1. 首页
+
+ 
+
+4. 小说详情页
+
+ 
+
+5. 目录页
+
+ 
+
+5. 小说阅读页
+
+ 
+
+#### 蓝色主题模版截图（更新中）
+
+ 
+
+#### 安装步骤（源码，小白请看其他安装教程）
##### 数据库安装：
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)
@@ -211,9 +289,17 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
#### QQ交流群
-[点击前往官网查看](https://xiongxyang.gitee.io/home/service.htm)
+[点击前往官网查看](https://xiongxyang.gitee.io/service.htm)
-#### 微信公众号（发布最新更新资讯）
+问问题的三要素
+
+1. 说明背景，使用了哪个模块，要做什么？
+
+2. 怎么输入或操作的得到了什么结果？ 截图，日志
+
+3. 哪里不明白或有什么疑问 ？
+
+#### 微信公众号（发布最新更新资讯、最新前端模版、最新爬虫规则、技术文档等）
@@ -227,12 +313,12 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
-### 免责声明
+#### 免责声明
本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。
用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
-### 备注
+#### 备注
精品小说屋所有相关项目均已在开源中国公开，感兴趣的可进入[开源中国](https://www.oschina.net/p/fiction_house)按关键字`精品小说屋`搜索。
diff --git a/doc/api.md b/doc/api/api.md
similarity index 100%
rename from doc/api.md
rename to doc/api/api.md
diff --git a/es/index_create.txt b/doc/es/index_create.txt
similarity index 100%
rename from es/index_create.txt
rename to doc/es/index_create.txt
diff --git a/sql/20200511.sql b/doc/sql/20200511.sql
similarity index 100%
rename from sql/20200511.sql
rename to doc/sql/20200511.sql
diff --git a/sql/20200513.sql b/doc/sql/20200513.sql
similarity index 100%
rename from sql/20200513.sql
rename to doc/sql/20200513.sql
diff --git a/sql/20200518.sql b/doc/sql/20200518.sql
similarity index 100%
rename from sql/20200518.sql
rename to doc/sql/20200518.sql
diff --git a/sql/20200608.sql b/doc/sql/20200608.sql
similarity index 100%
rename from sql/20200608.sql
rename to doc/sql/20200608.sql
diff --git a/sql/20200615.sql b/doc/sql/20200615.sql
similarity index 100%
rename from sql/20200615.sql
rename to doc/sql/20200615.sql
diff --git a/sql/20201103.sql b/doc/sql/20201103.sql
similarity index 100%
rename from sql/20201103.sql
rename to doc/sql/20201103.sql
diff --git a/sql/20201109.sql b/doc/sql/20201109.sql
similarity index 100%
rename from sql/20201109.sql
rename to doc/sql/20201109.sql
diff --git a/sql/20201122.sql b/doc/sql/20201122.sql
similarity index 100%
rename from sql/20201122.sql
rename to doc/sql/20201122.sql
diff --git a/sql/20201201.sql b/doc/sql/20201201.sql
similarity index 100%
rename from sql/20201201.sql
rename to doc/sql/20201201.sql
diff --git a/doc/sql/20210726.sql b/doc/sql/20210726.sql
new file mode 100644
index 0000000..7e56bf6
--- /dev/null
+++ b/doc/sql/20210726.sql
@@ -0,0 +1 @@
+alter table news add column `read_count` BIGINT NOT NULL DEFAULT '0' COMMENT '阅读量' after content;
\ No newline at end of file
diff --git a/sql/novel_plus.sql b/doc/sql/novel_plus.sql
similarity index 90%
rename from sql/novel_plus.sql
rename to doc/sql/novel_plus.sql
index 2c4c9ad..f812822 100644
--- a/sql/novel_plus.sql
+++ b/doc/sql/novel_plus.sql
@@ -491,13 +491,6 @@ CREATE TABLE `sys_dept` (
-- ----------------------------
-- Records of sys_dept
-- ----------------------------
-INSERT INTO `sys_dept` VALUES ('6', '0', '研发部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('7', '6', '研發一部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('8', '6', '研发二部', '2', '1');
-INSERT INTO `sys_dept` VALUES ('9', '0', '销售部', '2', '1');
-INSERT INTO `sys_dept` VALUES ('10', '9', '销售一部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('11', '0', '产品部', '3', '1');
-INSERT INTO `sys_dept` VALUES ('12', '11', '产品一部', '1', '1');
INSERT INTO `sys_dept` VALUES ('13', '0', '测试部', '5', '1');
INSERT INTO `sys_dept` VALUES ('14', '13', '测试一部', '1', '1');
INSERT INTO `sys_dept` VALUES ('15', '13', '测试二部', '2', '1');
@@ -894,52 +887,6 @@ CREATE TABLE `sys_log` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1412 DEFAULT CHARSET=utf8 COMMENT='系统日志';
--- ----------------------------
--- Records of sys_log
--- ----------------------------
-INSERT INTO `sys_log` VALUES ('1369', '-1', '获取用户信息为空', '登录', '462', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:21');
-INSERT INTO `sys_log` VALUES ('1370', '-1', '获取用户信息为空', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:26');
-INSERT INTO `sys_log` VALUES ('1371', '1', 'admin', '登录', '98', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:33');
-INSERT INTO `sys_log` VALUES ('1372', '1', 'admin', '请求访问主页', '372', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:09:33');
-INSERT INTO `sys_log` VALUES ('1373', '1', 'admin', '请求访问主页', '28', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:12:41');
-INSERT INTO `sys_log` VALUES ('1374', '1', 'admin', '编辑角色', '11', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:18:42');
-INSERT INTO `sys_log` VALUES ('1375', '1', 'admin', '添加菜单', '2', 'com.java2nb.system.controller.MenuController.add()', null, '127.0.0.1', '2020-05-13 11:19:55');
-INSERT INTO `sys_log` VALUES ('1376', '1', 'admin', '保存菜单', '225', 'com.java2nb.system.controller.MenuController.save()', null, '127.0.0.1', '2020-05-13 11:24:42');
-INSERT INTO `sys_log` VALUES ('1377', '1', 'admin', '编辑菜单', '15', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:54');
-INSERT INTO `sys_log` VALUES ('1378', '1', 'admin', '编辑菜单', '11', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:58');
-INSERT INTO `sys_log` VALUES ('1379', '1', 'admin', '更新菜单', '241', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:12');
-INSERT INTO `sys_log` VALUES ('1380', '1', 'admin', '编辑菜单', '8', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:25:16');
-INSERT INTO `sys_log` VALUES ('1381', '1', 'admin', '更新菜单', '199', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:26');
-INSERT INTO `sys_log` VALUES ('1382', '1', 'admin', '编辑角色', '13', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:26:11');
-INSERT INTO `sys_log` VALUES ('1383', '1', 'admin', '更新角色', '931', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:26:36');
-INSERT INTO `sys_log` VALUES ('1384', '-1', '获取用户信息为空', '登录', '11', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:02');
-INSERT INTO `sys_log` VALUES ('1385', '1', 'admin', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:08');
-INSERT INTO `sys_log` VALUES ('1386', '1', 'admin', '请求访问主页', '27', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:08');
-INSERT INTO `sys_log` VALUES ('1387', '1', 'admin', '登录', '272', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:56');
-INSERT INTO `sys_log` VALUES ('1388', '1', 'admin', '请求访问主页', '109', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:56');
-INSERT INTO `sys_log` VALUES ('1389', '1', 'admin', '编辑角色', '8', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:30:36');
-INSERT INTO `sys_log` VALUES ('1390', '1', 'admin', '更新角色', '567', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:30:42');
-INSERT INTO `sys_log` VALUES ('1391', '-1', '获取用户信息为空', '登录', '246', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:38');
-INSERT INTO `sys_log` VALUES ('1392', '1', 'admin', '登录', '38', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:42');
-INSERT INTO `sys_log` VALUES ('1393', '1', 'admin', '请求访问主页', '110', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:31:43');
-INSERT INTO `sys_log` VALUES ('1394', '1', 'admin', 'error', null, 'http://127.0.0.1/test/order/list', 'org.springframework.jdbc.BadSqlGrammarException: \r\n### Error querying database. Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\r\n### The error may exist in file [E:\\baseprojectparent\\novel-plus\\novel-admin\\target\\classes\\mybatis\\test\\OrderMapper.xml]\r\n### The error may involve defaultParameterMap\r\n### The error occurred while setting parameters\r\n### SQL: select `id`,`fb_merchant_code`,`merchant_order_sn`,`order_sn`,`platform_order_no`,`trade_no`,`order_state`,`fn_coupon`,`red_packet`,`total_fee`,`order_price`,`fee`,`body`,`attach`,`store_id`,`cashier_id`,`device_no`,`user_id`,`user_logon_id`,`pay_time`,`pay_channel`,`no_cash_coupon_fee`,`cash_coupon_fee`,`cash_fee`,`sign`,`options`,`create_time`,`push_time`,`push_ip`,`mcht_id`,`sn` from fb_order order by id desc limit ?, ?\r\n### Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist', null, '2020-05-13 11:33:27');
-INSERT INTO `sys_log` VALUES ('1395', '1', 'admin', '登录', '276', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:39:20');
-INSERT INTO `sys_log` VALUES ('1396', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:39:20');
-INSERT INTO `sys_log` VALUES ('1397', '1', 'admin', '登录', '285', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:47:00');
-INSERT INTO `sys_log` VALUES ('1398', '1', 'admin', '请求访问主页', '90', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:47:00');
-INSERT INTO `sys_log` VALUES ('1399', '1', 'admin', '登录', '251', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:48:28');
-INSERT INTO `sys_log` VALUES ('1400', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:48:28');
-INSERT INTO `sys_log` VALUES ('1401', '1', 'admin', '登录', '302', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:09:33');
-INSERT INTO `sys_log` VALUES ('1402', '1', 'admin', '请求访问主页', '88', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:09:34');
-INSERT INTO `sys_log` VALUES ('1403', '1', 'admin', '请求更改用户密码', '3', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:11:49');
-INSERT INTO `sys_log` VALUES ('1404', '1', 'admin', 'admin提交更改用户密码', '140', 'com.java2nb.system.controller.UserController.adminResetPwd()', null, '127.0.0.1', '2020-05-13 14:11:50');
-INSERT INTO `sys_log` VALUES ('1405', '1', 'admin', '请求更改用户密码', '4', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:12:11');
-INSERT INTO `sys_log` VALUES ('1406', '1', 'admin', '登录', '275', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:14:26');
-INSERT INTO `sys_log` VALUES ('1407', '1', 'admin', '请求访问主页', '73', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:14:27');
-INSERT INTO `sys_log` VALUES ('1408', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:38');
-INSERT INTO `sys_log` VALUES ('1409', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:47');
-INSERT INTO `sys_log` VALUES ('1410', '1', 'admin', '登录', '261', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:18:07');
-INSERT INTO `sys_log` VALUES ('1411', '1', 'admin', '请求访问主页', '83', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:18:07');
-- ----------------------------
-- Table structure for sys_menu
@@ -1047,9 +994,6 @@ CREATE TABLE `sys_role` (
-- Records of sys_role
-- ----------------------------
INSERT INTO `sys_role` VALUES ('1', '超级用户角色', 'admin', '拥有最高权限', '2', '2017-08-12 00:43:52', '2017-08-12 19:14:59');
-INSERT INTO `sys_role` VALUES ('59', '普通用户', null, '基本用户权限', null, null, null);
-INSERT INTO `sys_role` VALUES ('60', '测试', null, '<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;
\ No newline at end of file
+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\":\"([^/]+)\",\"authorNamePatten\":\"([^/]+)\",\"picUrlPatten\":\"