code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

message模块拆离优化

Browse Source
This commit is contained in:
Chopper
2021-12-07 04:12:51 +08:00
parent 8ddf622d0f
commit b8b14df39b
45 changed files with 91 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java
View File

@@ -7,7 +7,7 @@ import cn.lili.common.utils.HttpUtils;
import cn.lili.modules.goods.entity.dos.Commodity;
import cn.lili.modules.goods.entity.dos.Studio;
import cn.lili.modules.goods.entity.dto.GoodsInfo;
import cn.lili.modules.message.util.WechatAccessTokenUtil;
import cn.lili.modules.wechat.util.WechatAccessTokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

2
framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java
View File

@@ -4,7 +4,7 @@ import cn.hutool.json.JSONObject;
import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.modules.message.util.WechatAccessTokenUtil;
import cn.lili.modules.wechat.util.WechatAccessTokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

2
framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java → framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsReach.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.entity.dos;
package cn.lili.modules.sms.entity.dos;
import cn.lili.mybatis.BaseIdEntity;
import com.baomidou.mybatisplus.annotation.FieldFill;

2
framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java → framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsSign.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.entity.dos;
package cn.lili.modules.sms.entity.dos;
import cn.lili.mybatis.BaseIdEntity;
import com.baomidou.mybatisplus.annotation.TableName;

2
framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java → framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsTemplate.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.entity.dos;
package cn.lili.modules.sms.entity.dos;
import cn.lili.mybatis.BaseIdEntity;
import com.baomidou.mybatisplus.annotation.TableName;

4
framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java → framework/src/main/java/cn/lili/modules/sms/entity/dto/SmsReachDTO.java
View File

@@ -1,6 +1,6 @@
package cn.lili.modules.message.entity.dto;
package cn.lili.modules.sms.entity.dto;
import cn.lili.modules.message.entity.dos.SmsReach;
import cn.lili.modules.sms.entity.dos.SmsReach;
import lombok.Data;
import java.util.List;

4
framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java → framework/src/main/java/cn/lili/modules/sms/mapper/SmsReachMapper.java
View File

@@ -1,6 +1,6 @@
package cn.lili.modules.message.mapper;
package cn.lili.modules.sms.mapper;
import cn.lili.modules.message.entity.dos.SmsReach;
import cn.lili.modules.sms.entity.dos.SmsReach;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

4
framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java → framework/src/main/java/cn/lili/modules/sms/mapper/SmsSignMapper.java
View File

@@ -1,6 +1,6 @@
package cn.lili.modules.message.mapper;
package cn.lili.modules.sms.mapper;
import cn.lili.modules.message.entity.dos.SmsSign;
import cn.lili.modules.sms.entity.dos.SmsSign;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

4
framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java → framework/src/main/java/cn/lili/modules/sms/mapper/SmsTemplateMapper.java
View File

@@ -1,6 +1,6 @@
package cn.lili.modules.message.mapper;
package cn.lili.modules.sms.mapper;
import cn.lili.modules.message.entity.dos.SmsTemplate;
import cn.lili.modules.sms.entity.dos.SmsTemplate;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

4
framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java → framework/src/main/java/cn/lili/modules/sms/service/SmsReachService.java
View File

@@ -1,6 +1,6 @@
package cn.lili.modules.message.service;
package cn.lili.modules.sms.service;
import cn.lili.modules.message.entity.dos.SmsReach;
import cn.lili.modules.sms.entity.dos.SmsReach;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

4
framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java → framework/src/main/java/cn/lili/modules/sms/service/SmsSignService.java
View File

@@ -1,7 +1,7 @@
package cn.lili.modules.message.service;
package cn.lili.modules.sms.service;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.message.entity.dos.SmsSign;
import cn.lili.modules.sms.entity.dos.SmsSign;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

4
framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java → framework/src/main/java/cn/lili/modules/sms/service/SmsTemplateService.java
View File

@@ -1,7 +1,7 @@
package cn.lili.modules.message.service;
package cn.lili.modules.sms.service;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.message.entity.dos.SmsTemplate;
import cn.lili.modules.sms.entity.dos.SmsTemplate;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

10
framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java → framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsReachServiceImpl.java
View File

@@ -1,14 +1,14 @@
package cn.lili.modules.message.serviceimpl;
package cn.lili.modules.sms.serviceimpl;
import cn.hutool.json.JSONUtil;
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.rocketmq.tags.OtherTagsEnum;
import cn.lili.common.utils.BeanUtil;
import cn.lili.common.properties.RocketmqCustomProperties;
import cn.lili.modules.message.entity.dos.SmsReach;
import cn.lili.modules.message.entity.dto.SmsReachDTO;
import cn.lili.modules.message.mapper.SmsReachMapper;
import cn.lili.modules.message.service.SmsReachService;
import cn.lili.modules.sms.entity.dos.SmsReach;
import cn.lili.modules.sms.entity.dto.SmsReachDTO;
import cn.lili.modules.sms.mapper.SmsReachMapper;
import cn.lili.modules.sms.service.SmsReachService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired;

8
framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java → framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsSignServiceImpl.java
View File

@@ -1,13 +1,13 @@
package cn.lili.modules.message.serviceimpl;
package cn.lili.modules.sms.serviceimpl;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.modules.system.sms.AliSmsUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.message.entity.dos.SmsSign;
import cn.lili.modules.message.mapper.SmsSignMapper;
import cn.lili.modules.message.service.SmsSignService;
import cn.lili.modules.sms.entity.dos.SmsSign;
import cn.lili.modules.sms.mapper.SmsSignMapper;
import cn.lili.modules.sms.service.SmsSignService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

8
framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java → framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsTemplateServiceImpl.java
View File

@@ -1,11 +1,11 @@
package cn.lili.modules.message.serviceimpl;
package cn.lili.modules.sms.serviceimpl;
import cn.lili.modules.system.sms.AliSmsUtil;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.message.entity.dos.SmsTemplate;
import cn.lili.modules.message.mapper.SmsTemplateMapper;
import cn.lili.modules.message.service.SmsTemplateService;
import cn.lili.modules.sms.entity.dos.SmsTemplate;
import cn.lili.modules.sms.mapper.SmsTemplateMapper;
import cn.lili.modules.sms.service.SmsTemplateService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

4
framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java
View File

@@ -1,7 +1,7 @@
package cn.lili.modules.system.sms;
import cn.lili.modules.message.entity.dos.SmsSign;
import cn.lili.modules.message.entity.dos.SmsTemplate;
import cn.lili.modules.sms.entity.dos.SmsSign;
import cn.lili.modules.sms.entity.dos.SmsTemplate;
import java.util.Map;

4
framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java
View File

@@ -16,8 +16,8 @@ import cn.lili.common.properties.SystemSettingProperties;
import cn.lili.common.utils.Base64Utils;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.message.entity.dos.SmsSign;
import cn.lili.modules.message.entity.dos.SmsTemplate;
import cn.lili.modules.sms.entity.dos.SmsSign;
import cn.lili.modules.sms.entity.dos.SmsTemplate;
import cn.lili.modules.system.entity.dos.Setting;
import cn.lili.modules.system.entity.dto.SmsSetting;
import cn.lili.modules.system.entity.enums.SettingEnum;

2
framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java → framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMPMessage.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.entity.dos;
package cn.lili.modules.wechat.entity.dos;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;

2
framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java → framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMessage.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.entity.dos;
package cn.lili.modules.wechat.entity.dos;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;

2
framework/src/main/java/cn/lili/modules/message/entity/enums/WechatMessageItemEnums.java → framework/src/main/java/cn/lili/modules/wechat/entity/enums/WechatMessageItemEnums.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.entity.enums;
package cn.lili.modules.wechat.entity.enums;
/**
* 微信模版设置变量

4
framework/src/main/java/cn/lili/modules/message/mapper/WechatMPMessageMapper.java → framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMPMessageMapper.java
View File

@@ -1,7 +1,7 @@
package cn.lili.modules.message.mapper;
package cn.lili.modules.wechat.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.lili.modules.message.entity.dos.WechatMPMessage;
import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
import org.apache.ibatis.annotations.Delete;
/**

4
framework/src/main/java/cn/lili/modules/message/mapper/WechatMessageMapper.java → framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMessageMapper.java
View File

@@ -1,6 +1,6 @@
package cn.lili.modules.message.mapper;
package cn.lili.modules.wechat.mapper;
import cn.lili.modules.message.entity.dos.WechatMessage;
import cn.lili.modules.wechat.entity.dos.WechatMessage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Delete;

4
framework/src/main/java/cn/lili/modules/message/service/WechatMPMessageService.java → framework/src/main/java/cn/lili/modules/wechat/service/WechatMPMessageService.java
View File

@@ -1,7 +1,7 @@
package cn.lili.modules.message.service;
package cn.lili.modules.wechat.service;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.lili.modules.message.entity.dos.WechatMPMessage;
import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
/**
* 微信小程序消息订阅 业务层

4
framework/src/main/java/cn/lili/modules/message/service/WechatMessageService.java → framework/src/main/java/cn/lili/modules/wechat/service/WechatMessageService.java
View File

@@ -1,6 +1,6 @@
package cn.lili.modules.message.service;
package cn.lili.modules.wechat.service;
import cn.lili.modules.message.entity.dos.WechatMessage;
import cn.lili.modules.wechat.entity.dos.WechatMessage;
import com.baomidou.mybatisplus.extension.service.IService;
/**

14
framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java → framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPMessageServiceImpl.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.serviceimpl;
package cn.lili.modules.wechat.serviceimpl;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONArray;
@@ -8,12 +8,12 @@ import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.common.utils.HttpUtils;
import cn.lili.modules.message.entity.dos.WechatMPMessage;
import cn.lili.modules.message.entity.enums.WechatMessageItemEnums;
import cn.lili.modules.message.mapper.WechatMPMessageMapper;
import cn.lili.modules.message.service.WechatMPMessageService;
import cn.lili.modules.message.util.WechatAccessTokenUtil;
import cn.lili.modules.message.util.WechatMessageUtil;
import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
import cn.lili.modules.wechat.entity.enums.WechatMessageItemEnums;
import cn.lili.modules.wechat.mapper.WechatMPMessageMapper;
import cn.lili.modules.wechat.service.WechatMPMessageService;
import cn.lili.modules.wechat.util.WechatAccessTokenUtil;
import cn.lili.modules.wechat.util.WechatMessageUtil;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;

14
framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java → framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.serviceimpl;
package cn.lili.modules.wechat.serviceimpl;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
@@ -7,12 +7,12 @@ import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.common.utils.HttpUtils;
import cn.lili.modules.message.entity.dos.WechatMessage;
import cn.lili.modules.message.entity.enums.WechatMessageItemEnums;
import cn.lili.modules.message.mapper.WechatMessageMapper;
import cn.lili.modules.message.service.WechatMessageService;
import cn.lili.modules.message.util.WechatAccessTokenUtil;
import cn.lili.modules.message.util.WechatMessageUtil;
import cn.lili.modules.wechat.entity.dos.WechatMessage;
import cn.lili.modules.wechat.entity.enums.WechatMessageItemEnums;
import cn.lili.modules.wechat.mapper.WechatMessageMapper;
import cn.lili.modules.wechat.service.WechatMessageService;
import cn.lili.modules.wechat.util.WechatAccessTokenUtil;
import cn.lili.modules.wechat.util.WechatMessageUtil;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;

2
framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java → framework/src/main/java/cn/lili/modules/wechat/util/WechatAccessTokenUtil.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.util;
package cn.lili.modules.wechat.util;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;

2
framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java → framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageData.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.util;
package cn.lili.modules.wechat.util;
import cn.hutool.json.JSONUtil;
import lombok.Data;

13
framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java → framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.util;
package cn.lili.modules.wechat.util;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
@@ -12,18 +12,17 @@ import cn.lili.modules.connect.entity.Connect;
import cn.lili.modules.connect.entity.enums.ConnectEnum;
import cn.lili.modules.connect.service.ConnectService;
import cn.lili.modules.member.entity.dto.ConnectQueryDTO;
import cn.lili.modules.message.entity.dos.WechatMPMessage;
import cn.lili.modules.message.entity.dos.WechatMessage;
import cn.lili.modules.message.entity.enums.WechatMessageItemEnums;
import cn.lili.modules.message.service.WechatMPMessageService;
import cn.lili.modules.message.service.WechatMessageService;
import cn.lili.modules.wechat.entity.dos.WechatMPMessage;
import cn.lili.modules.wechat.entity.dos.WechatMessage;
import cn.lili.modules.wechat.entity.enums.WechatMessageItemEnums;
import cn.lili.modules.wechat.service.WechatMPMessageService;
import cn.lili.modules.wechat.service.WechatMessageService;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.service.OrderItemService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.common.utils.HttpUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

2
framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java → framework/src/main/java/cn/lili/modules/wechat/util/WechatMpCodeUtil.java
View File

@@ -1,4 +1,4 @@
package cn.lili.modules.message.util;
package cn.lili.modules.wechat.util;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;