caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!88 修复文章内容编辑无格式问题

Browse Source 
Merge pull request !88 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2021-12-23 11:23:18 +00:00 committed by Gitee
commit eb25827937
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java
View File

@ -2,7 +2,6 @@ package cn.lili.common.security.filter;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.http.HtmlUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.owasp.html.Sanitizers; import org.owasp.html.Sanitizers;
@ -48,6 +47,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
"encrypted", "encrypted",
"iv", "iv",
"mail", "mail",
"sell",
"privateKey", "privateKey",
"wechatpay", "wechatpay",
}; };
@ -267,7 +267,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
private String filterXss(String name, String value) { private String filterXss(String name, String value) {
if (CharSequenceUtil.containsAny(name.toLowerCase(Locale.ROOT), IGNORE_FIELD)) { if (CharSequenceUtil.containsAny(name.toLowerCase(Locale.ROOT), IGNORE_FIELD)) {
// 忽略的处理，（过滤敏感字符） // 忽略的处理，（过滤敏感字符）
return HtmlUtil.unescape(HtmlUtil.filter(value)); return value;
} else { } else {
return cleanXSS(value); return cleanXSS(value);
} }

2
framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
View File

@ -81,7 +81,7 @@ public class RefundSupport {
**/ **/
private void updateReturnGoodsNumber(AfterSale afterSale) { private void updateReturnGoodsNumber(AfterSale afterSale) {
//根据商品id及订单sn获取子订单 //根据商品id及订单sn获取子订单
OrderItem orderItem = orderItemService.getByOrderSnAndSkuId(afterSale.getOrderSn(), afterSale.getGoodsId()); OrderItem orderItem = orderItemService.getByOrderSnAndSkuId(afterSale.getOrderSn(), afterSale.getSkuId());
orderItem.setReturnGoodsNumber(afterSale.getNum() + orderItem.getReturnGoodsNumber()); orderItem.setReturnGoodsNumber(afterSale.getNum() + orderItem.getReturnGoodsNumber());