From 83afb9e6e2a18d0749c7be7a23e6f27146c92844 Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <773861846@qq.com> Date: Fri, 5 Feb 2021 00:17:19 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=85=E7=BD=AE?= =?UTF-8?q?=E7=88=AC=E8=99=AB=E6=BA=90i=E7=AC=94=E8=B6=A3=E9=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/novel_plus.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/sql/novel_plus.sql b/doc/sql/novel_plus.sql index 72826c3..c9def48 100644 --- a/doc/sql/novel_plus.sql +++ b/doc/sql/novel_plus.sql @@ -1836,4 +1836,6 @@ 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\":\"]+)\\\"\\\\s+onerror=\\\"this.src=\",\"picUrlPrefix\":\"http://m.ibiquge.net\",\"statusPatten\":\">状态：([^/]+)\",\"bookStatusRule\":{\"连载\":0,\"完结\":1},\"visitCountPatten\":\">点击：(\\\\d+)\",\"descStart\":\"

\",\"descEnd\":\"

\",\"bookIndexUrl\":\"http://www.ibiquge.net/{bookId}/\",\"bookIndexStart\":\"正文\",\"indexIdPatten\":\"[^/]+\",\"indexNamePatten\":\"([^/]+)\",\"bookContentUrl\":\"http://www.ibiquge.net/{bookId}/{indexId}.html\",\"contentStart\":\"

\",\"contentEnd\":\"
\"}', 0, '2021-02-04 21:31:23', '2021-02-04 21:31:23'); \ No newline at end of file -- Gitee From 91e525ec8e5c97282c0a5f50c0cb7b71b073192c Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <773861846@qq.com> Date: Fri, 5 Feb 2021 00:39:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?v3.5.1=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- novel-admin/pom.xml | 2 +- .../novel/controller/StatController.java | 16 +- .../test/controller/OrderController.java | 135 ----- .../java/com/java2nb/test/dao/OrderDao.java | 32 -- .../java/com/java2nb/test/domain/OrderDO.java | 475 ------------------ .../java2nb/test/service/OrderService.java | 30 -- .../test/service/impl/OrderServiceImpl.java | 55 -- .../resources/mybatis/test/OrderMapper.xml | 283 ----------- .../resources/static/sql/test/order/menu.js | 18 - 9 files changed, 8 insertions(+), 1038 deletions(-) delete mode 100644 novel-admin/src/main/java/com/java2nb/test/controller/OrderController.java delete mode 100644 novel-admin/src/main/java/com/java2nb/test/dao/OrderDao.java delete mode 100644 novel-admin/src/main/java/com/java2nb/test/domain/OrderDO.java delete mode 100644 novel-admin/src/main/java/com/java2nb/test/service/OrderService.java delete mode 100644 novel-admin/src/main/java/com/java2nb/test/service/impl/OrderServiceImpl.java delete mode 100644 novel-admin/src/main/resources/mybatis/test/OrderMapper.xml delete mode 100644 novel-admin/src/main/resources/static/sql/test/order/menu.js diff --git a/novel-admin/pom.xml b/novel-admin/pom.xml index 5c214db..2d91572 100644 --- a/novel-admin/pom.xml +++ b/novel-admin/pom.xml @@ -5,7 +5,7 @@ com.java2nb novel-admin - 3.5.0 + 3.5.1 jar novel-admin 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/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'; -- Gitee From f5e440390b2bc21683543e46ae2502bfed112df8 Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <773861846@qq.com> Date: Thu, 11 Feb 2021 08:27:11 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9404=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC=E9=A6=96=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- novel-front/src/main/resources/templates/404.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/novel-front/src/main/resources/templates/404.html b/novel-front/src/main/resources/templates/404.html index 47cb326..f0aed0b 100644 --- a/novel-front/src/main/resources/templates/404.html +++ b/novel-front/src/main/resources/templates/404.html @@ -6,7 +6,7 @@ -- Gitee From 2603150b33c37be002b35c6484c0202091b686c6 Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <773861846@qq.com> Date: Thu, 11 Feb 2021 08:31:27 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BD=9C=E5=AE=B6=E4=B8=93=E5=8C=BA?= =?UTF-8?q?=E7=9A=84=E8=B7=B3=E8=BD=AC=E6=96=B9=E5=BC=8F=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=96=B0=E6=A0=87=E7=AD=BE=E9=A1=B5=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- novel-front/src/main/resources/templates/common/top.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/novel-front/src/main/resources/templates/common/top.html b/novel-front/src/main/resources/templates/common/top.html index 80fc951..4905644 100644 --- a/novel-front/src/main/resources/templates/common/top.html +++ b/novel-front/src/main/resources/templates/common/top.html @@ -43,7 +43,7 @@
  • 全部作品
  • 排行榜
  • 充值
    • -
  • 作家专区
    • +
  • 作家专区
    • -- Gitee From 19d4a9960d9dc6f42625bb8d71ea97effe42445b Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <773861846@qq.com> Date: Thu, 11 Feb 2021 09:36:03 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=87=92=E5=8A=A0=E8=BD=BD=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/javascript/lazyload.js | 180 ++++++++++++++++++ .../src/main/resources/templates/index.html | 82 ++++---- 2 files changed, 222 insertions(+), 40 deletions(-) create mode 100644 novel-front/src/main/resources/static/javascript/lazyload.js diff --git a/novel-front/src/main/resources/static/javascript/lazyload.js b/novel-front/src/main/resources/static/javascript/lazyload.js new file mode 100644 index 0000000..da97305 --- /dev/null +++ b/novel-front/src/main/resources/static/javascript/lazyload.js @@ -0,0 +1,180 @@ +/*! + * Lazy Load - JavaScript plugin for lazy loading images + * + * Copyright (c) 2007-2019 Mika Tuupola + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/mit-license.php + * + * Project home: + * https://appelsiini.net/projects/lazyload + * + * Version: 2.0.0-rc.2 + * + */ + +(function (root, factory) { + if (typeof exports === "object") { + module.exports = factory(root); + } else if (typeof define === "function" && define.amd) { + define([], factory); + } else { + root.LazyLoad = factory(root); + } +}) (typeof global !== "undefined" ? global : this.window || this.global, function (root) { + + "use strict"; + + if (typeof define === "function" && define.amd){ + root = window; + } + + const defaults = { + src: "data-src", + srcset: "data-srcset", + selector: ".lazyload", + root: null, + rootMargin: "0px", + threshold: 0 + }; + + /** + * Merge two or more objects. Returns a new object. + * @private + * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] + * @param {Object} objects The objects to merge together + * @returns {Object} Merged values of defaults and options + */ + const extend = function () { + + let extended = {}; + let deep = false; + let i = 0; + let length = arguments.length; + + /* Check if a deep merge */ + if (Object.prototype.toString.call(arguments[0]) === "[object Boolean]") { + deep = arguments[0]; + i++; + } + + /* Merge the object into the extended object */ + let merge = function (obj) { + for (let prop in obj) { + if (Object.prototype.hasOwnProperty.call(obj, prop)) { + /* If deep merge and property is an object, merge properties */ + if (deep && Object.prototype.toString.call(obj[prop]) === "[object Object]") { + extended[prop] = extend(true, extended[prop], obj[prop]); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + /* Loop through each object and conduct a merge */ + for (; i < length; i++) { + let obj = arguments[i]; + merge(obj); + } + + return extended; + }; + + function LazyLoad(images, options) { + this.settings = extend(defaults, options || {}); + this.images = images || document.querySelectorAll(this.settings.selector); + this.observer = null; + this.init(); + } + + LazyLoad.prototype = { + init: function() { + + /* Without observers load everything and bail out early. */ + if (!root.IntersectionObserver) { + this.loadImages(); + return; + } + + let self = this; + let observerConfig = { + root: this.settings.root, + rootMargin: this.settings.rootMargin, + threshold: [this.settings.threshold] + }; + + this.observer = new IntersectionObserver(function(entries) { + Array.prototype.forEach.call(entries, function (entry) { + if (entry.isIntersecting) { + self.observer.unobserve(entry.target); + let src = entry.target.getAttribute(self.settings.src); + let srcset = entry.target.getAttribute(self.settings.srcset); + if ("img" === entry.target.tagName.toLowerCase()) { + if (src) { + entry.target.src = src; + } + if (srcset) { + entry.target.srcset = srcset; + } + } else { + entry.target.style.backgroundImage = "url(" + src + ")"; + } + } + }); + }, observerConfig); + + Array.prototype.forEach.call(this.images, function (image) { + self.observer.observe(image); + }); + }, + + loadAndDestroy: function () { + if (!this.settings) { return; } + this.loadImages(); + this.destroy(); + }, + + loadImages: function () { + if (!this.settings) { return; } + + let self = this; + Array.prototype.forEach.call(this.images, function (image) { + let src = image.getAttribute(self.settings.src); + let srcset = image.getAttribute(self.settings.srcset); + if ("img" === image.tagName.toLowerCase()) { + if (src) { + image.src = src; + } + if (srcset) { + image.srcset = srcset; + } + } else { + image.style.backgroundImage = "url('" + src + "')"; + } + }); + }, + + destroy: function () { + if (!this.settings) { return; } + this.observer.disconnect(); + this.settings = null; + } + }; + + root.lazyload = function(images, options) { + return new LazyLoad(images, options); + }; + + if (root.jQuery) { + const $ = root.jQuery; + $.fn.lazyload = function (options) { + options = options || {}; + options.attribute = options.attribute || "data-src"; + new LazyLoad($.makeArray(this), options); + return this; + }; + } + + return LazyLoad; +}); \ No newline at end of file diff --git a/novel-front/src/main/resources/templates/index.html b/novel-front/src/main/resources/templates/index.html index 6ee5378..98f9d16 100644 --- a/novel-front/src/main/resources/templates/index.html +++ b/novel-front/src/main/resources/templates/index.html @@ -57,7 +57,6 @@
    -
    @@ -83,7 +82,6 @@
    -
    @@ -141,7 +139,7 @@
    -
    +
    @@ -153,6 +151,7 @@
    + diff --git a/templates/orange/html/common/top.html b/templates/orange/html/common/top.html index 80fc951..4905644 100644 --- a/templates/orange/html/common/top.html +++ b/templates/orange/html/common/top.html @@ -43,7 +43,7 @@
  • 全部作品
  • 排行榜
  • 充值
    • -
  • 作家专区
    • +
  • 作家专区
    • diff --git a/templates/orange/html/index.html b/templates/orange/html/index.html index 6ee5378..98f9d16 100644 --- a/templates/orange/html/index.html +++ b/templates/orange/html/index.html @@ -57,7 +57,6 @@
    -
    @@ -83,7 +82,6 @@
    -
    @@ -141,7 +139,7 @@
    -
    +
    @@ -153,6 +151,7 @@
    +