From 975550374af6cc821bf1f73f12b52cfd140d2458 Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Fri, 18 Jun 2021 07:55:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/MemberMessageBuyerController.java | 6 +- .../listener/NoticeSendMessageListener.java | 150 ++++++++++++++---- .../member/serviceimpl/MemberServiceImpl.java | 6 +- .../entity/dos/MemberMessage.java | 5 +- .../modules/message/entity/dos/Message.java | 6 +- .../entity/enums/MessageSendClient.java | 27 ++++ .../entity/vos}/MemberMessageQueryVO.java | 11 +- .../mapper/MemberMessageMapper.java | 4 +- .../service/MemberMessageService.java | 17 +- .../message/service/StoreMessageService.java | 4 +- .../serviceimpl/MemberMessageServiceImpl.java | 19 ++- .../MemberMessageManagerController.java | 45 ++++++ 12 files changed, 249 insertions(+), 51 deletions(-) rename framework/src/main/java/cn/lili/modules/{member => message}/entity/dos/MemberMessage.java (89%) create mode 100644 framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java rename framework/src/main/java/cn/lili/modules/{member/entity/vo => message/entity/vos}/MemberMessageQueryVO.java (66%) rename framework/src/main/java/cn/lili/modules/{member => message}/mapper/MemberMessageMapper.java (69%) rename framework/src/main/java/cn/lili/modules/{member => message}/service/MemberMessageService.java (74%) rename framework/src/main/java/cn/lili/modules/{member => message}/serviceimpl/MemberMessageServiceImpl.java (78%) create mode 100644 manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java index 0460250c..1dae47d7 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java @@ -4,9 +4,9 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.enums.MessageStatusEnum; -import cn.lili.modules.member.entity.dos.MemberMessage; -import cn.lili.modules.member.entity.vo.MemberMessageQueryVO; -import cn.lili.modules.member.service.MemberMessageService; +import cn.lili.modules.message.entity.dos.MemberMessage; +import cn.lili.modules.message.entity.vos.MemberMessageQueryVO; +import cn.lili.modules.message.service.MemberMessageService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java index f30d41e7..01433f64 100644 --- a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java @@ -1,18 +1,27 @@ package cn.lili.listener; import cn.hutool.json.JSONUtil; +import cn.lili.common.enums.SwitchEnum; import cn.lili.common.rocketmq.tags.OtherTagsEnum; import cn.lili.common.sms.SmsUtil; +import cn.lili.common.vo.PageVO; +import cn.lili.modules.member.entity.dos.Member; +import cn.lili.modules.member.entity.vo.MemberSearchVO; import cn.lili.modules.member.mapper.MemberMapper; +import cn.lili.modules.member.service.MemberService; +import cn.lili.modules.message.entity.dos.MemberMessage; import cn.lili.modules.message.entity.dos.Message; import cn.lili.modules.message.entity.dos.StoreMessage; import cn.lili.modules.message.entity.dto.SmsReachDTO; +import cn.lili.modules.message.entity.enums.MessageSendClient; import cn.lili.modules.message.entity.enums.MessageStatusEnum; import cn.lili.modules.message.entity.enums.RangeEnum; +import cn.lili.modules.message.service.MemberMessageService; import cn.lili.modules.message.service.StoreMessageService; import cn.lili.modules.store.entity.dos.Store; import cn.lili.modules.store.service.StoreService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.rocketmq.common.message.MessageExt; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; @@ -41,9 +50,15 @@ public class NoticeSendMessageListener implements RocketMQListener { //店铺消息 @Autowired private StoreMessageService storeMessageService; + //会员消息 + @Autowired + private MemberMessageService memberMessageService; //店铺 @Autowired private StoreService storeService; + //会员 + @Autowired + private MemberService memberService; @Override public void onMessage(MessageExt messageExt) { @@ -51,7 +66,6 @@ public class NoticeSendMessageListener implements RocketMQListener { case SMS: String smsJsonStr = new String(messageExt.getBody()); SmsReachDTO smsReachDTO = JSONUtil.toBean(smsJsonStr, SmsReachDTO.class); - //发送全部会员 if (smsReachDTO.getSmsRange().equals(RangeEnum.ALL.name())) { //获取所有会员的手机号 @@ -65,38 +79,118 @@ public class NoticeSendMessageListener implements RocketMQListener { //管理员发送站内信 case MESSAGE: Message message = JSONUtil.toBean(new String(messageExt.getBody()), Message.class); - List list = new ArrayList<>(); - //保存商家记录 - if (message.getMessageRange().equals("ALL")) { - List storeList = storeService.list(new QueryWrapper().eq("store_disable", "OPEN")); - storeList.forEach(item -> { - StoreMessage storeMessage = new StoreMessage(); - storeMessage.setMessageId(message.getId()); - storeMessage.setStoreName(item.getStoreName()); - storeMessage.setStoreId(item.getId()); - storeMessage.setStatus(MessageStatusEnum.UN_READY.name()); - storeMessage.setTitle(message.getTitle()); - storeMessage.setContent(message.getContent()); - list.add(storeMessage); - }); + // 管理端发送给商家的站内信 + if (message.getMessageClient().equals(MessageSendClient.STORE.name().toLowerCase())) { + saveStoreMessage(message); } else { - int i = 0; - for (String str : message.getUserIds()) { - StoreMessage storeMessage = new StoreMessage(); - storeMessage.setMessageId(message.getId()); - storeMessage.setStoreId(str); - storeMessage.setStoreName(message.getUserNames()[i]); - storeMessage.setStatus(MessageStatusEnum.UN_READY.name()); - storeMessage.setTitle(message.getTitle()); - storeMessage.setContent(message.getContent()); - list.add(storeMessage); - i++; - } + //管理员发送给会员的站内信 + saveMemberMessage(message); } - storeMessageService.save(list); break; default: break; } } + + /** + * 保存店铺消息 + * + * @param message 消息 + */ + private void saveStoreMessage(Message message) { + List list = new ArrayList<>(); + //发送全部商家情况 + if (message.getMessageRange().equals("ALL")) { + List storeList = storeService.list(new QueryWrapper().eq("store_disable", "OPEN")); + storeList.forEach(item -> { + StoreMessage storeMessage = new StoreMessage(); + storeMessage.setMessageId(message.getId()); + storeMessage.setStoreName(item.getStoreName()); + storeMessage.setStoreId(item.getId()); + storeMessage.setStatus(MessageStatusEnum.UN_READY.name()); + storeMessage.setTitle(message.getTitle()); + storeMessage.setContent(message.getContent()); + list.add(storeMessage); + }); + } else { + //发送给指定商家情况 + int i = 0; + for (String str : message.getUserIds()) { + StoreMessage storeMessage = new StoreMessage(); + storeMessage.setMessageId(message.getId()); + storeMessage.setStoreId(str); + storeMessage.setStoreName(message.getUserNames()[i]); + storeMessage.setStatus(MessageStatusEnum.UN_READY.name()); + storeMessage.setTitle(message.getTitle()); + storeMessage.setContent(message.getContent()); + list.add(storeMessage); + i++; + } + } + if (list.size() > 0) { + //执行保存 + storeMessageService.save(list); + } + } + + /** + * 保存会员消息 + * + * @param message 消息 + */ + private void saveMemberMessage(Message message) { + List list = new ArrayList<>(); + //如果是给所有会员发送消息 + if (message.getMessageRange().equals("ALL")) { + //查询所有会员总数，因为会员总数比较大 如果一次性查出来会占用数据库资源，所以要分页查询 + MemberSearchVO memberSearchVO = new MemberSearchVO(); + memberSearchVO.setDisabled(SwitchEnum.OPEN.name()); + Integer memberNum = memberService.getMemberNum(memberSearchVO); + //构建分页查询参数 + //100条查一次 + Integer pageSize = 200; + Integer pageCount = 0; + pageCount = memberNum / pageSize; + pageCount = memberNum % pageSize > 0 ? pageCount + 1 : pageCount; + for (int i = 1; i <= pageCount; i++) { + PageVO pageVO = new PageVO(); + pageVO.setPageSize(pageSize); + pageVO.setPageNumber(i); + IPage page = memberService.getMemberPage(memberSearchVO, pageVO); + //循环要保存的信息 + page.getRecords().forEach(item -> { + MemberMessage memberMessage = new MemberMessage(); + memberMessage.setContent(message.getContent()); + memberMessage.setTitle(message.getTitle()); + memberMessage.setMessageId(message.getId()); + memberMessage.setMemberId(item.getId()); + memberMessage.setMemberName(item.getUsername()); + memberMessage.setStatus(MessageStatusEnum.UN_READY.name()); + list.add(memberMessage); + }); + } + + } else { + //如果是给指定会员发送消息 + int i = 0; + for (String str : message.getUserIds()) { + MemberMessage memberMessage = new MemberMessage(); + memberMessage.setMessageId(message.getId()); + memberMessage.setMemberId(str); + memberMessage.setMemberName(message.getUserNames()[i]); + memberMessage.setStatus(MessageStatusEnum.UN_READY.name()); + memberMessage.setTitle(message.getTitle()); + memberMessage.setContent(message.getContent()); + list.add(memberMessage); + i++; + } + } + if (list.size() > 0) { + //执行保存 + memberMessageService.save(list); + } + + } + + } diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 2ca33490..59b3ad34 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -541,9 +541,9 @@ public class MemberServiceImpl extends ServiceImpl impleme queryWrapper.like(StringUtils.isNotBlank(memberSearchVO.getUsername()), "username", memberSearchVO.getUsername()); //按照电话号码查询 queryWrapper.like(StringUtils.isNotBlank(memberSearchVO.getMobile()), "mobile", memberSearchVO.getMobile()); - //按照电话号码查询 - queryWrapper.like(StringUtils.isNotBlank(memberSearchVO.getDisabled()), "disabled", memberSearchVO.getDisabled()); - queryWrapper.orderByDesc("create_time"); + //按照状态查询 + queryWrapper.eq(StringUtils.isNotBlank(memberSearchVO.getDisabled()), "disabled", + memberSearchVO.getDisabled().equals(SwitchEnum.OPEN.name()) ? 1 : 0); queryWrapper.orderByDesc("create_time"); return this.count(queryWrapper); } diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java similarity index 89% rename from framework/src/main/java/cn/lili/modules/member/entity/dos/MemberMessage.java rename to framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java index d0ce5fa6..f148ab05 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java @@ -1,4 +1,4 @@ -package cn.lili.modules.member.entity.dos; +package cn.lili.modules.message.entity.dos; import cn.lili.base.BaseEntity; import cn.lili.modules.message.entity.enums.MessageStatusEnum; @@ -37,6 +37,9 @@ public class MemberMessage extends BaseEntity { @ApiModelProperty(value = "消息内容") private String content; + @ApiModelProperty(value = "关联消息id") + private String messageId; + /** * @see MessageStatusEnum */ diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java index 5be9f77f..34d0aacc 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java @@ -2,6 +2,7 @@ package cn.lili.modules.message.entity.dos; import cn.lili.base.BaseEntity; import cn.lili.modules.message.entity.enums.RangeEnum; +import cn.lili.modules.message.entity.enums.MessageSendClient; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -37,7 +38,10 @@ public class Message extends BaseEntity { @ApiModelProperty(value = "发送范围") private String messageRange; - @ApiModelProperty(value = "发送客户端 商家和会员") + /** + * @see MessageSendClient + */ + @ApiModelProperty(value = "发送客户端 商家或者会员") private String messageClient; @Transient diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java new file mode 100644 index 00000000..f063535b --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java @@ -0,0 +1,27 @@ +package cn.lili.modules.message.entity.enums; + +/** + * 消息发送客户端 + * + * @author pikachu + * @date 2020/12/8 9:46 + */ +public enum MessageSendClient { + + //全部用户 + MEMBER("会员"), + //指定用户 + STORE("店铺"); + + private final String description; + + MessageSendClient(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } + + +} diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberMessageQueryVO.java b/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java similarity index 66% rename from framework/src/main/java/cn/lili/modules/member/entity/vo/MemberMessageQueryVO.java rename to framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java index 4264facf..1311d052 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberMessageQueryVO.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java @@ -1,17 +1,19 @@ -package cn.lili.modules.member.entity.vo; +package cn.lili.modules.message.entity.vos; import cn.lili.modules.message.entity.enums.MessageStatusEnum; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 会员消息查询 + * 会员接收消息查询vo * * @author Chopper - * @date 2020-02-25 14:10:16 + * @date 2020/12/2 17:50 */ @Data +@ApiModel(value = "会员接收消息查询vo") public class MemberMessageQueryVO { private static final long serialVersionUID = 1L; @@ -22,6 +24,9 @@ public class MemberMessageQueryVO { @ApiModelProperty(value = "状态") private String status; + @ApiModelProperty(value = "消息id") + private String messageId; + @ApiModelProperty(value = "消息标题") private String title; diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java similarity index 69% rename from framework/src/main/java/cn/lili/modules/member/mapper/MemberMessageMapper.java rename to framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java index a727b6e2..72f4f373 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMessageMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java @@ -1,7 +1,7 @@ -package cn.lili.modules.member.mapper; +package cn.lili.modules.message.mapper; -import cn.lili.modules.member.entity.dos.MemberMessage; +import cn.lili.modules.message.entity.dos.MemberMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java similarity index 74% rename from framework/src/main/java/cn/lili/modules/member/service/MemberMessageService.java rename to framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java index b271110f..70e4ef9d 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberMessageService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java @@ -1,11 +1,13 @@ -package cn.lili.modules.member.service; +package cn.lili.modules.message.service; import cn.lili.common.vo.PageVO; -import cn.lili.modules.member.entity.dos.MemberMessage; -import cn.lili.modules.member.entity.vo.MemberMessageQueryVO; +import cn.lili.modules.message.entity.dos.MemberMessage; +import cn.lili.modules.message.entity.vos.MemberMessageQueryVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * 消息发送业务层 * @@ -41,4 +43,13 @@ public interface MemberMessageService extends IService { Boolean deleteMessage(String messageId); + /** + * 保存消息信息 + * + * @param messages 消息 + * @return + */ + boolean save(List messages); + + } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java index ad700035..7b8aa737 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * 消息发送业务层 + * 店铺接收消息业务层 * * @author Chopper * @date 2020/11/17 3:44 下午 @@ -34,7 +34,7 @@ public interface StoreMessageService extends IService { IPage getPage(StoreMessageQueryVO storeMessageQueryVO, PageVO pageVO); /** - * 保存消息信息 + * 保存店铺消息信息 * * @param messages 消息 * @return diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java similarity index 78% rename from framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberMessageServiceImpl.java rename to framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java index db131c08..835dcdf7 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java @@ -1,19 +1,21 @@ -package cn.lili.modules.member.serviceimpl; +package cn.lili.modules.message.serviceimpl; import cn.lili.common.utils.PageUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; -import cn.lili.modules.member.entity.dos.MemberMessage; -import cn.lili.modules.member.entity.vo.MemberMessageQueryVO; -import cn.lili.modules.member.mapper.MemberMessageMapper; -import cn.lili.modules.member.service.MemberMessageService; +import cn.lili.modules.message.entity.dos.MemberMessage; +import cn.lili.modules.message.mapper.MemberMessageMapper; +import cn.lili.modules.message.service.MemberMessageService; +import cn.lili.modules.message.entity.vos.MemberMessageQueryVO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** * 会员消息业务层实现 * @@ -28,6 +30,8 @@ public class MemberMessageServiceImpl extends ServiceImpl getPage(MemberMessageQueryVO memberMessageQueryVO, PageVO pageVO) { QueryWrapper queryWrapper = new QueryWrapper<>(); + //消息id + queryWrapper.like(StringUtils.isNotEmpty(memberMessageQueryVO.getMessageId()), "message_id", memberMessageQueryVO.getMessageId()); //消息标题 queryWrapper.like(StringUtils.isNotEmpty(memberMessageQueryVO.getTitle()), "title", memberMessageQueryVO.getTitle()); //会员id @@ -61,4 +65,9 @@ public class MemberMessageServiceImpl extends ServiceImpl messages) { + return saveBatch(messages); + } } \ No newline at end of file diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java new file mode 100644 index 00000000..49b17813 --- /dev/null +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java @@ -0,0 +1,45 @@ +package cn.lili.controller.member; + +import cn.lili.common.enums.ResultUtil; +import cn.lili.common.vo.PageVO; +import cn.lili.common.vo.ResultMessage; +import cn.lili.modules.message.entity.dos.MemberMessage; +import cn.lili.modules.message.entity.dos.StoreMessage; +import cn.lili.modules.message.entity.vos.MemberMessageQueryVO; +import cn.lili.modules.message.entity.vos.StoreMessageQueryVO; +import cn.lili.modules.message.service.MemberMessageService; +import cn.lili.modules.message.service.StoreMessageService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 管理端,会员消息消息管理接口 + * + * @author pikachu + * @date: 2020/12/6 16:09 + */ +@Transactional +@RestController +@Api(tags = "管理端,会员消息消息管理接口") +@RequestMapping("/manager/message/member") +public class MemberMessageManagerController { + @Autowired + private MemberMessageService memberMessageService; + + + @GetMapping + @ApiOperation(value = "多条件分页获取") + public ResultMessage> getByCondition(MemberMessageQueryVO memberMessageQueryVO, + PageVO pageVo) { + IPage page = memberMessageService.getPage(memberMessageQueryVO, pageVo); + return ResultUtil.data(page); + } + +} From aaf53440ac7a109d2c83a8225140c0b3ca559b48 Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Sun, 20 Jun 2021 11:05:14 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=B3=A8=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/message/entity/dos/MemberMessage.java | 2 +- .../main/java/cn/lili/modules/message/entity/dos/Message.java | 2 ++ .../cn/lili/modules/message/entity/dos/NoticeMessage.java | 4 ++-- .../java/cn/lili/modules/message/entity/dos/StoreMessage.java | 2 +- .../cn/lili/modules/message/mapper/MemberMessageMapper.java | 2 +- .../java/cn/lili/modules/message/mapper/MessageMapper.java | 2 +- .../modules/message/mapper/NoticeMessageTemplateMapper.java | 2 +- .../cn/lili/modules/message/mapper/StoreMessageMapper.java | 2 +- .../cn/lili/modules/message/service/MemberMessageService.java | 2 +- .../java/cn/lili/modules/message/service/MessageService.java | 2 +- .../cn/lili/modules/message/service/NoticeMessageService.java | 2 +- .../modules/message/serviceimpl/MemberMessageServiceImpl.java | 2 +- .../lili/modules/message/serviceimpl/MessageServiceImpl.java | 2 +- .../modules/message/serviceimpl/NoticeMessageServiceImpl.java | 2 +- 14 files changed, 16 insertions(+), 14 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java index f148ab05..378e35b6 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java @@ -11,7 +11,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 会员消息 + * 会员接受消息对象 * * @author Chopper * @date 2020-02-25 14:10:16 diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java index 34d0aacc..941e1391 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java @@ -14,6 +14,8 @@ import javax.persistence.Table; import javax.persistence.Transient; /** + * 管理段发送消息对象 + * * @author lili */ diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java index 817aff46..5ff11608 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java @@ -10,7 +10,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 站内消息模板设置 + * 通知类站内信模版对象 * * @author Bulbasaur * @version v4.1 @@ -20,7 +20,7 @@ import javax.persistence.Table; @Entity @Table(name = "li_notice_message") @TableName("li_notice_message") -@ApiModel(value = "站内消息模板") +@ApiModel(value = "通知类消息模板") public class NoticeMessage extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java index 12479e53..25fdfbd0 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java @@ -17,7 +17,7 @@ import javax.persistence.*; import java.util.Date; /** - * 店铺消息 + * 店铺接收消息对象 * @author Chopper * @date 2021/1/30 4:13 下午 */ diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java index 72f4f373..a745aa83 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * 会员消息数据处理层 + * 会员接收到消息数据处理层 * * @author lili * @date 2020-02-25 14:10:16 diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java index 64df8a05..8292f430 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java @@ -4,7 +4,7 @@ import cn.lili.modules.message.entity.dos.Message; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * 消息内容数据处理层 + * 管理端发送消息内容数据处理层 * @author Chopper * @date 2020/12/2 17:50 */ diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java index 38f1c3d6..689af2be 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java @@ -4,7 +4,7 @@ import cn.lili.modules.message.entity.dos.NoticeMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * 消息模板数据处理层 + * 通知类消息模板数据处理层 * * @author Bulbasaur * @date 2020/12/8 9:46 diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java index 4c580c00..64fa41d2 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** - * 消息发送数据处理层 + * 店铺接收到消息发送数据处理层 * * @author Chopper * @date 2021/1/30 4:17 下午 diff --git a/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java index 70e4ef9d..f66de34c 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * 消息发送业务层 + * 会员消息发送业务层 * * @author Chopper * @date 2020/11/17 3:44 下午 diff --git a/framework/src/main/java/cn/lili/modules/message/service/MessageService.java b/framework/src/main/java/cn/lili/modules/message/service/MessageService.java index f5189caf..0b63799f 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/MessageService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/MessageService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; /** - * 消息内容业务层 + * 管理端发送消息内容业务层 * * @author Chopper * @date 2020/11/17 3:44 下午 diff --git a/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java index fabf2576..aac79e54 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; /** - * 消息模板业务层 + * 通知类消息模板业务层 * * @author Bulbasaur * @date 2020/12/8 9:47 diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java index 835dcdf7..7b9a78ae 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java @@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; /** - * 会员消息业务层实现 + * 会员接收消息业务层实现 * * @author Chopper * @date 2020/11/17 3:48 下午 diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java index 357d60cf..94e52c20 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java @@ -17,7 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; /** - * 消息内容业务层实现 + * 管理端发送消息内容业务层实现 * * @author Chopper * @date 2020/11/17 3:48 下午 diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java index ab29dc40..3604fbd6 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java @@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Map; /** - * 消息模板业务层实现 + * 通知类消息模板业务层实现 * * @author Bulbasaur * @date 2020/12/8 9:48 From c7e4af6175a376f537f8d23f23e14c9b1dc34129 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 21 Jun 2021 14:14:07 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/admin/AdminApplication.java | 6 +- .../lili/controller/trade/CartController.java | 8 +- .../security/BuyerAuthenticationFilter.java | 4 +- .../cn/lili/security/BuyerSecurityConfig.java | 18 +-- .../cn/lili/buyer/test/cart/CartTest.java | 6 +- .../cn/lili/buyer/test/cart/FileTest.java | 2 +- .../controller/common/UploadController.java | 6 +- .../security/CommonSecurityConfig.java | 10 +- .../lili/event/impl/StockUpdateExecute.java | 4 +- .../lili/listener/GoodsMessageListener.java | 4 +- .../lili/listener/OrderMessageListener.java | 4 +- .../impl/order/CancelOrderTaskExecute.java | 4 +- .../impl/order/OrderEveryDayTaskExecute.java | 8 +- .../promotion/PromotionEverydayExecute.java | 4 +- .../trigger/AbstractDelayQueueListen.java | 14 +- .../BroadcastTimeTriggerExecutor.java | 2 +- .../PromotionTimeTriggerExecutor.java | 10 +- .../base/mybatisplus/MybatisPlusConfig.java | 12 +- .../common/aop/limiter/LimitInterceptor.java | 2 +- .../syslog/interceptor/SystemLogAspect.java | 2 +- .../cn/lili/common/cache/impl/RedisCache.java | 8 +- .../BaseElasticsearchService.java | 16 +- .../GlobalControllerExceptionHandler.java | 36 ++--- .../filter/XssHttpServletRequestWrapper.java | 24 +-- .../sms/impl/SmsUtilAliImplService.java | 10 +- .../java/cn/lili/common/token/TokenUtil.java | 10 +- .../base/generate/ManagerTokenGenerate.java | 2 +- .../base/generate/MemberTokenGenerate.java | 2 +- .../base/generate/StoreTokenGenerate.java | 2 +- .../utils/Base64DecodeMultipartFile.java | 2 +- .../cn/lili/common/utils/CheckMobileUtil.java | 8 +- .../java/cn/lili/common/utils/DateUtil.java | 10 +- .../utils/HibernateProxyTypeAdapter.java | 8 +- .../cn/lili/common/utils/HttpClientUtils.java | 70 ++++----- .../java/cn/lili/common/utils/PageUtil.java | 2 +- .../cn/lili/common/utils/PasswordUtil.java | 6 +- .../java/cn/lili/common/utils/SpelUtil.java | 16 +- .../lili/common/verification/ImageUtil.java | 24 +-- .../common/verification/SliderImageUtil.java | 30 ++-- .../service/impl/VerificationServiceImpl.java | 12 +- .../cn/lili/config/cache/RedisConfig.java | 18 +-- .../elasticsearch/ElasticsearchConfig.java | 6 +- .../config/interceptor/UrlConfiguration.java | 8 +- .../CreateTimeShardingTableAlgorithmBak.java | 6 +- .../lili/config/swagger/Swagger2Config.java | 28 ++-- .../cn/lili/config/thread/ThreadConfig.java | 10 +- .../websocket/WebSocketStompConfig.java | 8 +- .../java/cn/lili/generator/CodeGenerator.java | 18 +-- .../base/serviceimpl/RegionServiceImpl.java | 38 ++--- .../broadcast/entity/dos/Commodity.java | 4 +- .../broadcast/entity/dto/GoodsInfo.java | 4 +- .../serviceimpl/StudioServiceImpl.java | 6 +- .../broadcast/util/WechatLivePlayerUtil.java | 42 ++--- .../connect/request/AuthDefaultRequest.java | 10 +- .../connect/request/AuthWeiboRequest.java | 2 +- .../serviceimpl/ConnectServiceImpl.java | 12 +- .../modules/connect/util/AuthChecker.java | 4 +- .../modules/connect/util/Base64Utils.java | 6 +- .../modules/connect/util/ConnectUtil.java | 74 ++++----- .../cn/lili/modules/connect/util/IpUtils.java | 2 +- .../DistributionOrderServiceImpl.java | 6 +- .../plugin/impl/AliFileManagerPlugin.java | 4 +- .../serviceimpl/CategoryServiceImpl.java | 10 +- .../serviceimpl/GoodsGalleryServiceImpl.java | 4 +- .../goods/serviceimpl/GoodsServiceImpl.java | 28 ++-- .../serviceimpl/GoodsSkuServiceImpl.java | 22 +-- .../MemberNoticeSenterServiceImpl.java | 2 +- .../WechatMPMessageServiceImpl.java | 2 +- .../message/util/WechatMessageUtil.java | 4 +- .../message/util/WechatMpCodeUtil.java | 32 ++-- .../cart/render/impl/CartPriceRender.java | 14 +- .../cart/render/impl/CheckDataRender.java | 8 +- .../order/cart/render/impl/CouponRender.java | 2 +- .../cart/render/impl/FullDiscountRender.java | 12 +- .../cart/render/impl/SkuFreightRender.java | 2 +- .../cart/render/impl/SkuPromotionRender.java | 32 ++-- .../order/cart/service/CartServiceImpl.java | 22 +-- .../order/order/entity/dos/AfterSale.java | 4 +- .../order/entity/dto/OrderSearchParams.java | 20 +-- .../entity/vo/AfterSaleSearchParams.java | 6 +- .../order/order/entity/vo/OrderSimpleVO.java | 2 +- .../serviceimpl/AfterSaleServiceImpl.java | 2 +- .../serviceimpl/OrderPriceServiceImpl.java | 4 +- .../order/serviceimpl/OrderServiceImpl.java | 22 +-- .../ArticleCategoryServiceImpl.java | 10 +- .../modules/payment/kit/core/XmlHelper.java | 40 ++--- .../modules/payment/kit/core/kit/IpKit.java | 8 +- .../modules/payment/kit/core/kit/PayKit.java | 10 +- .../payment/kit/core/kit/QrCodeKit.java | 2 +- .../modules/payment/kit/core/kit/RsaKit.java | 6 +- .../payment/kit/core/kit/WxPayKit.java | 24 +-- .../payment/kit/plugin/alipay/AliPayApi.java | 4 +- .../kit/plugin/alipay/AliPayPlugin.java | 4 +- .../payment/kit/plugin/wechat/WechatApi.java | 4 +- .../kit/plugin/wechat/WechatPlugin.java | 26 ++-- .../serviceimpl/AdminUserServiceImpl.java | 2 +- .../serviceimpl/CouponServiceImpl.java | 28 ++-- .../serviceimpl/FullDiscountServiceImpl.java | 52 +++---- .../serviceimpl/PintuanServiceImpl.java | 50 +++--- .../serviceimpl/PointsGoodsServiceImpl.java | 4 +- .../PromotionGoodsServiceImpl.java | 12 +- .../PromotionPriceServiceImpl.java | 112 +++++++------- .../serviceimpl/PromotionServiceImpl.java | 30 ++-- .../serviceimpl/SeckillApplyServiceImpl.java | 24 +-- .../serviceimpl/SeckillServiceImpl.java | 24 +-- .../promotion/tools/PromotionTools.java | 14 +- .../serviceimpl/EsGoodsIndexServiceImpl.java | 14 +- .../serviceimpl/EsGoodsSearchServiceImpl.java | 12 +- .../aop/aspect/PageViewInterceptor.java | 8 +- .../statistics/model/vo/OrderOverviewVO.java | 2 +- .../IndexStatisticsServiceImpl.java | 6 +- .../OrderStatisticsDataServiceImpl.java | 6 +- .../statistics/util/StatisticsDateUtil.java | 2 +- .../statistics/util/StatisticsSuffix.java | 4 +- .../lili/modules/store/entity/dos/Bill.java | 6 +- .../store/entity/dto/BillSearchParams.java | 2 +- .../store/entity/vos/StoreSearchParams.java | 2 +- .../store/serviceimpl/BillServiceImpl.java | 26 ++-- .../InstantDelivery/dada/DadaPlugin.java | 30 ++-- .../serviceimpl/LogisticsServiceImpl.java | 14 +- .../lili/modules/system/utils/HttpUtils.java | 44 +++--- .../system/utils/SensitiveWordsFilter.java | 54 +++---- .../modules/system/utils/StringPointer.java | 4 +- .../goods/CategoryManagerController.java | 4 +- .../security/ManagerAuthenticationFilter.java | 28 ++-- .../lili/security/ManagerSecurityConfig.java | 18 +-- .../cn/lili/test/elasticsearch/EsTest.java | 146 +++++++++--------- .../cn/lili/test/order/OrderServiceTest.java | 12 +- .../cn/lili/test/promotion/CouponTest.java | 32 ++-- .../lili/test/promotion/FullDiscountTest.java | 2 +- .../security/StoreAuthenticationFilter.java | 2 +- .../cn/lili/security/StoreSecurityConfig.java | 18 +-- 132 files changed, 994 insertions(+), 994 deletions(-) diff --git a/admin/src/main/java/cn/lili/admin/AdminApplication.java b/admin/src/main/java/cn/lili/admin/AdminApplication.java index d88d42e3..68c232ba 100644 --- a/admin/src/main/java/cn/lili/admin/AdminApplication.java +++ b/admin/src/main/java/cn/lili/admin/AdminApplication.java @@ -37,11 +37,11 @@ public class AdminApplication { successHandler.setDefaultTargetUrl(this.adminServer.path("/")); http.authorizeRequests().antMatchers("/instances**").permitAll(); http.authorizeRequests( - (authorizeRequests) -> authorizeRequests.antMatchers(this.adminServer.path("/assets/**")).permitAll() // 授予公众对所有静态资产和登录页面的访问权限。 + (authorizeRequests) -> authorizeRequests.antMatchers(this.adminServer.path("/assets/**")).permitAll() //授予公众对所有静态资产和登录页面的访问权限。 .antMatchers(this.adminServer.path("/login")).permitAll().anyRequest().authenticated() //其他所有请求都必须经过验证。 ).formLogin( - (formLogin) -> formLogin.loginPage(this.adminServer.path("/login")).successHandler(successHandler).and() // 配置登录和注销。 - ).logout((logout) -> logout.logoutUrl(this.adminServer.path("/logout"))).httpBasic(Customizer.withDefaults()) // 启用HTTP基本支持。这是Spring Boot Admin Client注册所必需的。 + (formLogin) -> formLogin.loginPage(this.adminServer.path("/login")).successHandler(successHandler).and() //配置登录和注销。 + ).logout((logout) -> logout.logoutUrl(this.adminServer.path("/logout"))).httpBasic(Customizer.withDefaults()) //启用HTTP基本支持。这是Spring Boot Admin Client注册所必需的。 .csrf().disable() .rememberMe((rememberMe) -> rememberMe.key(UUID.randomUUID().toString()).tokenValiditySeconds(1209600)); } diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java index b5ffaeea..8150f750 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java @@ -51,11 +51,11 @@ public class CartController { @NotNull(message = "购买数量不能为空") @Min(value = 1, message = "加入购物车数量必须大于0") Integer num, String cartType) { try { - // 读取选中的列表 + //读取选中的列表 cartService.add(skuId, num, cartType); return ResultUtil.success(); } catch (ServiceException se) { - log.error(se.getMsg(), se); + log.info(se.getMsg(), se); return ResultUtil.error(se.getResultCode().code(), se.getResultCode().message()); } catch (Exception e) { log.error(ResultCode.CART_ERROR.message(), e); @@ -157,7 +157,7 @@ public class CartController { @GetMapping("/checked") public ResultMessage cartChecked(@NotNull(message = "读取选中列表") String way) { try { - // 读取选中的列表 + //读取选中的列表 return ResultUtil.data(this.cartService.getCheckedTradeDTO(CartTypeEnum.valueOf(way))); } catch (ServiceException se) { log.error(se.getMsg(), se); @@ -239,7 +239,7 @@ public class CartController { @PostMapping(value = "/create/trade", consumes = "application/json", produces = "application/json") public ResultMessage crateTrade(@RequestBody TradeParams tradeParams) { try { - // 读取选中的列表 + //读取选中的列表 return ResultUtil.data(this.cartService.createTrade(tradeParams)); } catch (ServiceException se) { log.error(se.getMsg(), se); diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java index 71fddde1..2b7134af 100755 --- a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java +++ b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java @@ -67,7 +67,7 @@ public class BuyerAuthenticationFilter extends BasicAuthenticationFilter { //从header中获取jwt String jwt = request.getHeader(SecurityEnum.HEADER_TOKEN.getValue()); try { - // 如果没有token 则return + //如果没有token 则return if (StrUtil.isBlank(jwt)) { chain.doFilter(request, response); return; @@ -99,7 +99,7 @@ public class BuyerAuthenticationFilter extends BasicAuthenticationFilter { String json = claims.get(SecurityEnum.USER_CONTEXT.getValue()).toString(); AuthUser authUser = new Gson().fromJson(json, AuthUser.class); - // 校验redis中是否有权限 + //校验redis中是否有权限 if (cache.hasKey(CachePrefix.ACCESS_TOKEN.getPrefix(UserEnums.MEMBER) + jwt)) { //构造返回信息 List auths = new ArrayList<>(); diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java b/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java index 81815fe9..779e0d78 100644 --- a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java +++ b/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java @@ -48,35 +48,35 @@ public class BuyerSecurityConfig extends WebSecurityConfigurerAdapter { ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry registry = http .authorizeRequests(); - // 配置的url 不需要授权 + //配置的url 不需要授权 for (String url : ignoredUrlsProperties.getUrls()) { registry.antMatchers(url).permitAll(); } registry .and() - // 禁止网页iframe + //禁止网页iframe .headers().frameOptions().disable() .and() .logout() .permitAll() .and() .authorizeRequests() - // 任何请求 + //任何请求 .anyRequest() - // 需要身份认证 + //需要身份认证 .authenticated() .and() - // 允许跨域 + //允许跨域 .cors().configurationSource((CorsConfigurationSource) SpringContextUtil.getBean("corsConfigurationSource")).and() - // 关闭跨站请求防护 + //关闭跨站请求防护 .csrf().disable() - // 前后端分离采用JWT 不需要session + //前后端分离采用JWT 不需要session .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) .and() - // 自定义权限拒绝处理类 + //自定义权限拒绝处理类 .exceptionHandling().accessDeniedHandler(accessDeniedHandler) .and() - // 添加JWT认证过滤器 + //添加JWT认证过滤器 .addFilter(new BuyerAuthenticationFilter(authenticationManager(), cache)); } diff --git a/buyer-api/src/test/java/cn/lili/buyer/test/cart/CartTest.java b/buyer-api/src/test/java/cn/lili/buyer/test/cart/CartTest.java index 1cc333be..59f9a435 100644 --- a/buyer-api/src/test/java/cn/lili/buyer/test/cart/CartTest.java +++ b/buyer-api/src/test/java/cn/lili/buyer/test/cart/CartTest.java @@ -50,9 +50,9 @@ class CartTest { @Test void createTrade() { -// TradeDTO allTradeDTO = cartService.getAllTradeDTO(); -// Assert.assertNotNull(allTradeDTO); -// System.out.println(JsonUtil.objectToJson(allTradeDTO)); +// TradeDTO allTradeDTO = cartService.getAllTradeDTO(); +// Assert.assertNotNull(allTradeDTO); +// System.out.println(JsonUtil.objectToJson(allTradeDTO)); cartService.createTrade(new TradeParams()); } diff --git a/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java b/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java index 8076a648..4003ad5a 100644 --- a/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java +++ b/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java @@ -42,7 +42,7 @@ class FileTest { } URL url = new URL(brand.getLogo()); InputStream inputStream = url.openStream(); - // 上传至第三方云服务或服务器 + //上传至第三方云服务或服务器 brand.setLogo(fileManagerPlugin.inputStreamUpload(inputStream, brand.getId() + ".png")); } catch (IOException e) { log.error("上传你文件出错",e); diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 7f6d05cd..d2e84495 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -73,7 +73,7 @@ public class UploadController { } if (StringUtils.isNotBlank(base64)) { - // base64上传 + //base64上传 file = Base64DecodeMultipartFile.base64Convert(base64); } String result = ""; @@ -81,9 +81,9 @@ public class UploadController { File newFile = new File(); try { InputStream inputStream = file.getInputStream(); - // 上传至第三方云服务或服务器 + //上传至第三方云服务或服务器 result = fileManagerPlugin.inputStreamUpload(inputStream, fileKey); - // 保存数据信息至数据库 + //保存数据信息至数据库 newFile.setName(file.getOriginalFilename()); newFile.setFileSize(file.getSize()); newFile.setFileType(file.getContentType()); diff --git a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java b/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java index 15ba8a7c..a3cd9e4c 100644 --- a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java +++ b/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java @@ -48,18 +48,18 @@ public class CommonSecurityConfig extends WebSecurityConfigurerAdapter { .authorizeRequests(); registry .and() - // 禁止网页iframe + //禁止网页iframe .headers().frameOptions().disable() .and() .authorizeRequests() - // 任何请求 + //任何请求 .anyRequest() - // 需要身份认证 + //需要身份认证 .permitAll() .and() - // 允许跨域 + //允许跨域 .cors().configurationSource(corsConfigurationSource).and() - // 关闭跨站请求防护 + //关闭跨站请求防护 .csrf().disable(); } diff --git a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java index c8449df3..7c54b374 100644 --- a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java @@ -161,7 +161,7 @@ public class StockUpdateExecute implements OrderStatusChangeEvent { //促销库存key 集合 List promotionKey = new ArrayList<>(); - // 循环订单 + //循环订单 for (OrderItem orderItem : order.getOrderItems()) { skuKeys.add(GoodsSkuService.getStockCacheKey(orderItem.getSkuId())); GoodsSku goodsSku = new GoodsSku(); @@ -221,7 +221,7 @@ public class StockUpdateExecute implements OrderStatusChangeEvent { List goodsSkus = new ArrayList<>(); //sku库存key 集合 List skuKeys = new ArrayList<>(); - // 循环订单 + //循环订单 for (OrderItem orderItem : order.getOrderItems()) { skuKeys.add(GoodsSkuService.getStockCacheKey(orderItem.getSkuId())); GoodsSku goodsSku = new GoodsSku(); diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java index f02719b8..fa4132d0 100644 --- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java @@ -112,7 +112,7 @@ public class GoodsMessageListener implements RocketMQListener { for (GoodsCompleteMessage goodsCompleteMessage : goodsCompleteMessageList) { Goods goods = goodsService.getById(goodsCompleteMessage.getGoodsId()); if (goods != null) { - // 更新商品购买数量 + //更新商品购买数量 if (goods.getBuyCount() == null) { goods.setBuyCount(0); } @@ -126,7 +126,7 @@ public class GoodsMessageListener implements RocketMQListener { } GoodsSku goodsSku = goodsSkuService.getById(goodsCompleteMessage.getSkuId()); if (goodsSku != null) { - // 更新商品购买数量 + //更新商品购买数量 if (goodsSku.getBuyCount() == null) { goodsSku.setBuyCount(0); } diff --git a/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java b/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java index dfbb0c2f..892139e5 100644 --- a/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/OrderMessageListener.java @@ -56,9 +56,9 @@ public class OrderMessageListener implements RocketMQListener { result = false; } } - // 如所有步骤顺利完成 + //如所有步骤顺利完成 if (Boolean.TRUE.equals(result)) { - // 清除记录信息的trade cache key + //清除记录信息的trade cache key cache.remove(key); } break; diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java index 82e5262a..1202c425 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java @@ -43,11 +43,11 @@ public class CancelOrderTaskExecute implements EveryMinuteExecute { Setting setting = settingService.get(SettingEnum.ORDER_SETTING.name()); OrderSetting orderSetting = JSONUtil.toBean(setting.getSettingValue(), OrderSetting.class); if (orderSetting != null && orderSetting.getAutoCancel() != null) { - // 订单自动取消时间 = 当前时间 - 自动取消时间分钟数 + //订单自动取消时间 = 当前时间 - 自动取消时间分钟数 DateTime cancelTime = DateUtil.offsetMinute(DateUtil.date(), -orderSetting.getAutoCancel()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Order::getOrderStatus, OrderStatusEnum.UNPAID.name()); - // 订单创建时间 <= 订单自动取消时间 + //订单创建时间 <= 订单自动取消时间 queryWrapper.le(Order::getCreateTime, cancelTime); List list = orderService.list(queryWrapper); List cancelSnList = list.stream().map(Order::getSn).collect(Collectors.toList()); diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java index 784dee61..223489e3 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java @@ -73,11 +73,11 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { * @param orderSetting 订单设置 */ private void completedOrder(OrderSetting orderSetting) { - // 订单自动收货时间 = 当前时间 - 自动收货时间天数 + //订单自动收货时间 = 当前时间 - 自动收货时间天数 DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoEvaluation()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Order::getOrderStatus, OrderStatusEnum.DELIVERED.name()); - // 订单发货时间 >= 订单自动收货时间 + //订单发货时间 >= 订单自动收货时间 queryWrapper.ge(Order::getLogisticsTime, receiveTime); List list = orderService.list(queryWrapper); List receiveSnList = list.stream().map(Order::getSn).collect(Collectors.toList()); @@ -98,9 +98,9 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { * @param orderSetting 订单设置 */ private void memberEvaluation(OrderSetting orderSetting) { - // 订单自动收货时间 = 当前时间 - 自动收货时间天数 + //订单自动收货时间 = 当前时间 - 自动收货时间天数 DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoReceive()); - // 订单完成时间 <= 订单自动好评时间 + //订单完成时间 <= 订单自动好评时间 List orderItems = orderItemService.waitEvaluate(receiveTime); for (OrderItem orderItem : orderItems) { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java index b8f6686c..eb43758d 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java @@ -61,7 +61,7 @@ public class PromotionEverydayExecute implements EveryDayExecute { @Autowired private PromotionGoodsService promotionGoodsService; - // 系统设置 + //系统设置 @Autowired private SettingService settingService; @@ -108,7 +108,7 @@ public class PromotionEverydayExecute implements EveryDayExecute { List couponVOS = mongoTemplate.find(query, CouponVO.class); if (!couponVOS.isEmpty()) { List ids = new ArrayList<>(); - // // 关闭的优惠券活动 + // //关闭的优惠券活动 for (CouponVO vo : couponVOS) { vo.setPromotionStatus(PromotionStatusEnum.END.name()); if (vo.getPromotionGoodsList() != null && !vo.getPromotionGoodsList().isEmpty()) { diff --git a/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java b/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java index 6c539183..d76fcdaa 100644 --- a/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java +++ b/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java @@ -31,23 +31,23 @@ public abstract class AbstractDelayQueueListen { private void startDelayQueueMachine() { log.info("延时队列机器{}开始运作", setDelayQueueName()); - // 监听redis队列 + //监听redis队列 while (true) { try { - // 获取当前时间的时间戳 + //获取当前时间的时间戳 long now = System.currentTimeMillis() / 1000; - // 获取当前时间前需要执行的任务列表 + //获取当前时间前需要执行的任务列表 Set tuples = cache.zRangeByScore(setDelayQueueName(), 0, now); - // 如果任务不为空 + //如果任务不为空 if (!CollectionUtils.isEmpty(tuples)) { log.info("执行任务:{}", JSONUtil.toJsonStr(tuples)); for (DefaultTypedTuple tuple : tuples) { String jobId = (String) tuple.getValue(); - // 移除缓存，如果移除成功则表示当前线程处理了延时任务，则执行延时任务 + //移除缓存，如果移除成功则表示当前线程处理了延时任务，则执行延时任务 Long num = cache.zRemove(setDelayQueueName(), jobId); - // 如果移除成功, 则执行 + //如果移除成功, 则执行 if (num > 0) { ThreadPoolUtil.execute(() -> invoke(jobId)); } @@ -57,7 +57,7 @@ public abstract class AbstractDelayQueueListen { } catch (Exception e) { log.error("处理延时任务发生异常,异常原因为{}", e.getMessage(), e); } finally { - // 间隔一秒钟搞一次 + //间隔一秒钟搞一次 try { TimeUnit.SECONDS.sleep(5L); } catch (InterruptedException e) { diff --git a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java index ab42b58b..d6088916 100644 --- a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java +++ b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java @@ -29,7 +29,7 @@ public class BroadcastTimeTriggerExecutor implements TimeTriggerExecutor { BroadcastMessage broadcastMessage = JSONUtil.toBean(JSONUtil.parseObj(object), BroadcastMessage.class); if (broadcastMessage != null && broadcastMessage.getStudioId() != null) { log.info("直播间消费：{}", broadcastMessage); - // 修改直播间状态 + //修改直播间状态 studioService.updateStudioStatus(broadcastMessage); } } diff --git a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java index 211c9bde..5abd9433 100644 --- a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java +++ b/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java @@ -42,19 +42,19 @@ public class PromotionTimeTriggerExecutor implements TimeTriggerExecutor { @Override public void execute(Object object) { PromotionMessage promotionMessage = JSONUtil.toBean(JSONUtil.parseObj(object), PromotionMessage.class); - // 促销延时信息 + //促销延时信息 if (promotionMessage != null && promotionMessage.getPromotionId() != null) { log.info("促销活动信息消费：{}", promotionMessage); - // 如果为促销活动开始，则需要发布促销活动结束的定时任务 + //如果为促销活动开始，则需要发布促销活动结束的定时任务 if (PromotionStatusEnum.START.name().equals(promotionMessage.getPromotionStatus())) { if (!promotionService.updatePromotionStatus(promotionMessage)) { log.error("开始促销活动失败: {}", promotionMessage); return; } - // 促销活动开始后，设置促销活动结束的定时任务 + //促销活动开始后，设置促销活动结束的定时任务 promotionMessage.setPromotionStatus(PromotionStatusEnum.END.name()); String uniqueKey = "{TIME_TRIGGER_" + promotionMessage.getPromotionType() + "}_" + promotionMessage.getPromotionId(); - // 结束时间（延时一分钟） + //结束时间（延时一分钟） long closeTime = promotionMessage.getEndTime().getTime() + 60000; TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR, closeTime, promotionMessage, uniqueKey, rocketmqCustomProperties.getPromotionTopic()); //添加延时任务 @@ -69,7 +69,7 @@ public class PromotionTimeTriggerExecutor implements TimeTriggerExecutor { PintuanOrderMessage pintuanOrderMessage = JSONUtil.toBean(JSONUtil.parseObj(object), PintuanOrderMessage.class); if (pintuanOrderMessage != null && pintuanOrderMessage.getPintuanId() != null) { log.info("拼团订单信息消费：{}", pintuanOrderMessage); - // 拼团订单自动处理 + //拼团订单自动处理 orderService.agglomeratePintuanOrder(pintuanOrderMessage.getPintuanId(), pintuanOrderMessage.getOrderSn()); } } diff --git a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java b/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java index 1e077800..7407971c 100644 --- a/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java +++ b/framework/src/main/java/cn/lili/base/mybatisplus/MybatisPlusConfig.java @@ -20,12 +20,12 @@ public class MybatisPlusConfig { return new PaginationInterceptor(); //阻断解析器，测试环境使用 -// PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); +// PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); // -// List sqlParserList = new ArrayList<>(); -// // 攻击 SQL 阻断解析器、加入解析链 -// sqlParserList.add(new BlockAttackSqlParser()); -// paginationInterceptor.setSqlParserList(sqlParserList); -// return paginationInterceptor; +// List sqlParserList = new ArrayList<>(); +// //攻击 SQL 阻断解析器、加入解析链 +// sqlParserList.add(new BlockAttackSqlParser()); +// paginationInterceptor.setSqlParserList(sqlParserList); +// return paginationInterceptor; } } diff --git a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java b/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java index 4a0cf9c6..fd779456 100644 --- a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java +++ b/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java @@ -67,7 +67,7 @@ public class LimitInterceptor { try { Number count = redisTemplate.execute(limitScript, keys, limitCount, limitPeriod); log.info("Access try count is {} for name={} and key = {}", count, name, key); - // 如果缓存里没有值，或者他的值小于限制频率 + //如果缓存里没有值，或者他的值小于限制频率 if (count.intValue() <= limitCount) { return pjp.proceed(); } else { diff --git a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java b/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java index 1009fa09..ea814963 100644 --- a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java +++ b/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java @@ -102,7 +102,7 @@ public class SystemLogAspect { //请求参数 systemLogVO.setMapToParams(logParams); //响应参数 此处数据太大了，所以先注释掉 -// systemLogVO.setResponseBody(JSONUtil.toJsonStr(rvt)); +// systemLogVO.setResponseBody(JSONUtil.toJsonStr(rvt)); //请求IP systemLogVO.setIp(IpUtils.getIpAddress(request)); //IP地址 diff --git a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java b/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java index cc21e89b..85ca4838 100644 --- a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java +++ b/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java @@ -170,7 +170,7 @@ public class RedisCache implements Cache { @Override public Long cumulative(Object key, Object value) { HyperLogLogOperations operations = redisTemplate.opsForHyperLogLog(); - // add 方法对应 PFADD 命令 + //add 方法对应 PFADD 命令 return operations.add(key, value); } @@ -179,7 +179,7 @@ public class RedisCache implements Cache { public Long counter(Object key) { HyperLogLogOperations operations = redisTemplate.opsForHyperLogLog(); - // add 方法对应 PFADD 命令 + //add 方法对应 PFADD 命令 return operations.size(key); } @@ -198,7 +198,7 @@ public class RedisCache implements Cache { @Override public Long mergeCounter(Object... key) { HyperLogLogOperations operations = redisTemplate.opsForHyperLogLog(); - // 计数器合并累加 + //计数器合并累加 return operations.union(key[0], key); } @@ -223,7 +223,7 @@ public class RedisCache implements Cache { */ @Override public void incrementScore(String sortedSetName, String keyword) { - // x 的含义请见本方法的注释 + //x 的含义请见本方法的注释 double x = 1.0; this.redisTemplate.opsForZSet().incrementScore(sortedSetName, keyword, x); } diff --git a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java b/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java index a257a2ba..b5cbfe4e 100644 --- a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java +++ b/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java @@ -44,7 +44,7 @@ public abstract class BaseElasticsearchService { static { RequestOptions.Builder builder = RequestOptions.DEFAULT.toBuilder(); - // 默认缓冲限制为100MB，此处修改为30MB。 + //默认缓冲限制为100MB，此处修改为30MB。 builder.setHttpAsyncResponseConsumerFactory(new HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory(30 * 1024 * 1024)); COMMON_OPTIONS = builder.build(); } @@ -88,7 +88,7 @@ public abstract class BaseElasticsearchService { protected void createIndexRequest(String index) { try { CreateIndexRequest request = new CreateIndexRequest(index); - // Settings for this index + //Settings for this index request.settings(Settings.builder().put("index.number_of_shards", elasticsearchProperties.getIndex().getNumberOfShards()).put("index.number_of_replicas", elasticsearchProperties.getIndex().getNumberOfReplicas())); //创建索引 @@ -308,13 +308,13 @@ public abstract class BaseElasticsearchService { PutMappingRequest request = new PutMappingRequest(index) .source(source, XContentType.JSON); -// AcknowledgedResponse putMappingResponse = client.indices().putMapping(request, -// RequestOptions.DEFAULT); +// AcknowledgedResponse putMappingResponse = client.indices().putMapping(request, +// RequestOptions.DEFAULT); // -// boolean acknowledged = putMappingResponse.isAcknowledged(); -// if (acknowledged) { -// log.error("Succeed to put mapping"); -// } +// boolean acknowledged = putMappingResponse.isAcknowledged(); +// if (acknowledged) { +// log.error("Succeed to put mapping"); +// } CountDownLatch latch = new CountDownLatch(1); AtomicReference response = new AtomicReference(); client.indices().putMappingAsync( diff --git a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java index abac16d0..09f4838f 100644 --- a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java +++ b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java @@ -67,24 +67,24 @@ public class GlobalControllerExceptionHandler { return ResultUtil.error(ResultCode.ERROR); } -// /** -// * 通用的接口映射异常处理方 -// */ -// @Override -// protected ResponseEntity handleExceptionInternal(Exception ex, Object body, HttpHeaders headers, HttpStatus status, WebRequest request) { -// if (ex instanceof MethodArgumentNotValidException) { -// MethodArgumentNotValidException exception = (MethodArgumentNotValidException) ex; -// return new ResponseEntity<>(new ResultUtil<>().setErrorMsg(exception.getBindingResult().getAllErrors().get(0).getDefaultMessage()), status); -// } -// if (ex instanceof MethodArgumentTypeMismatchException) { -// MethodArgumentTypeMismatchException exception = (MethodArgumentTypeMismatchException) ex; -// logger.error("参数转换失败，方法：" + exception.getParameter().getMethod().getName() + "，参数：" + exception.getName() -// + ",信息：" + exception.getLocalizedMessage()); -// return new ResponseEntity<>(new ResultUtil<>().setErrorMsg("参数转换失败"), status); -// } -// ex.printStackTrace(); -// return new ResponseEntity<>(new ResultUtil<>().setErrorMsg("未知异常，请联系管理员"), status); -// } +// /** +// * 通用的接口映射异常处理方 +// */ +// @Override +// protected ResponseEntity handleExceptionInternal(Exception ex, Object body, HttpHeaders headers, HttpStatus status, WebRequest request) { +// if (ex instanceof MethodArgumentNotValidException) { +// MethodArgumentNotValidException exception = (MethodArgumentNotValidException) ex; +// return new ResponseEntity<>(new ResultUtil<>().setErrorMsg(exception.getBindingResult().getAllErrors().get(0).getDefaultMessage()), status); +// } +// if (ex instanceof MethodArgumentTypeMismatchException) { +// MethodArgumentTypeMismatchException exception = (MethodArgumentTypeMismatchException) ex; +// logger.error("参数转换失败，方法：" + exception.getParameter().getMethod().getName() + "，参数：" + exception.getName() +// + ",信息：" + exception.getLocalizedMessage()); +// return new ResponseEntity<>(new ResultUtil<>().setErrorMsg("参数转换失败"), status); +// } +// ex.printStackTrace(); +// return new ResponseEntity<>(new ResultUtil<>().setErrorMsg("未知异常，请联系管理员"), status); +// } /** * bean校验未通过异常 diff --git a/framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java b/framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java index 990bd0a6..cdc533e4 100644 --- a/framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java +++ b/framework/src/main/java/cn/lili/common/security/filter/XssHttpServletRequestWrapper.java @@ -80,7 +80,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { * @return */ private String cleanXSS2(String value) { - // 移除特殊标签 + //移除特殊标签 value = value.replaceAll("<", "<").replaceAll(">", ">"); value = value.replaceAll("\\(", "(").replaceAll("\\)", ")"); value = value.replaceAll("'", "'"); @@ -93,40 +93,40 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { private String cleanXSS(String value) { if (value != null) { //推荐使用ESAPI库来避免脚本攻击,value = ESAPI.encoder().canonicalize(value); -// // 避免空字符串 -// value = value.replaceAll(" ", ""); - // 避免script 标签 +// //避免空字符串 +// value = value.replaceAll(" ", ""); + //避免script 标签 Pattern scriptPattern = Pattern.compile("", Pattern.CASE_INSENSITIVE); value = scriptPattern.matcher(value).replaceAll(""); - // 避免src形式的表达式 + //避免src形式的表达式 scriptPattern = Pattern.compile("src[\r\n]*=[\r\n]*\\\'(.*?)\\\'", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL); value = scriptPattern.matcher(value).replaceAll(""); scriptPattern = Pattern.compile("src[\r\n]*=[\r\n]*\\\"(.*?)\\\"", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL); value = scriptPattern.matcher(value).replaceAll(""); - // 删除单个的 标签 + //删除单个的 标签 scriptPattern = Pattern.compile("", Pattern.CASE_INSENSITIVE); value = scriptPattern.matcher(value).replaceAll(""); - // 删除单个的