From b8b14df39b224421e04d94dbafd0a7dc38ecc3b2 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 7 Dec 2021 04:12:51 +0800 Subject: [PATCH] =?UTF-8?q?message=E6=A8=A1=E5=9D=97=E6=8B=86=E7=A6=BB?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connect/MiniProgramBuyerController.java | 6 +++--- .../MemberReceiptController.java | 2 +- .../WalletLogBuyerController.java | 2 +- .../lili/event/impl/WechatMessageExecute.java | 2 +- .../listener/NoticeSendMessageListener.java | 2 +- .../statistics/MemberStatisticsExecute.java | 17 ----------------- .../goods/util/WechatLivePlayerUtil.java | 2 +- .../modules/goods/util/WechatMediaUtil.java | 2 +- .../{message => sms}/entity/dos/SmsReach.java | 2 +- .../{message => sms}/entity/dos/SmsSign.java | 2 +- .../entity/dos/SmsTemplate.java | 2 +- .../entity/dto/SmsReachDTO.java | 4 ++-- .../{message => sms}/mapper/SmsReachMapper.java | 4 ++-- .../{message => sms}/mapper/SmsSignMapper.java | 4 ++-- .../mapper/SmsTemplateMapper.java | 4 ++-- .../service/SmsReachService.java | 4 ++-- .../service/SmsSignService.java | 4 ++-- .../service/SmsTemplateService.java | 4 ++-- .../serviceimpl/SmsReachServiceImpl.java | 10 +++++----- .../serviceimpl/SmsSignServiceImpl.java | 8 ++++---- .../serviceimpl/SmsTemplateServiceImpl.java | 8 ++++---- .../cn/lili/modules/system/sms/AliSmsUtil.java | 4 ++-- .../system/sms/impl/SmsUtilAliImplService.java | 4 ++-- .../entity/dos/WechatMPMessage.java | 2 +- .../entity/dos/WechatMessage.java | 2 +- .../entity/enums/WechatMessageItemEnums.java | 2 +- .../mapper/WechatMPMessageMapper.java | 4 ++-- .../mapper/WechatMessageMapper.java | 4 ++-- .../service/WechatMPMessageService.java | 4 ++-- .../service/WechatMessageService.java | 4 ++-- .../serviceimpl/WechatMPMessageServiceImpl.java | 14 +++++++------- .../serviceimpl/WechatMessageServiceImpl.java | 14 +++++++------- .../util/WechatAccessTokenUtil.java | 2 +- .../util/WechatMessageData.java | 2 +- .../util/WechatMessageUtil.java | 13 ++++++------- .../util/WechatMpCodeUtil.java | 2 +- .../setting/SmsManagerController.java | 4 ++-- .../setting/SmsSignManagerController.java | 4 ++-- .../setting/SmsTemplateManagerController.java | 4 ++-- .../WechatMPMessageManagerController.java | 4 ++-- .../setting/WechatMessageManageController.java | 4 ++-- .../MemberWalletManagerController.java | 2 +- .../MemberWithdrawApplyManagerController.java | 2 +- .../RechargeManagerController.java | 2 +- .../WalletLogManagerController.java | 2 +- 45 files changed, 91 insertions(+), 109 deletions(-) rename buyer-api/src/main/java/cn/lili/controller/{member => wallet}/MemberReceiptController.java (98%) rename buyer-api/src/main/java/cn/lili/controller/{order => wallet}/WalletLogBuyerController.java (97%) rename framework/src/main/java/cn/lili/modules/{message => sms}/entity/dos/SmsReach.java (97%) rename framework/src/main/java/cn/lili/modules/{message => sms}/entity/dos/SmsSign.java (96%) rename framework/src/main/java/cn/lili/modules/{message => sms}/entity/dos/SmsTemplate.java (96%) rename framework/src/main/java/cn/lili/modules/{message => sms}/entity/dto/SmsReachDTO.java (67%) rename framework/src/main/java/cn/lili/modules/{message => sms}/mapper/SmsReachMapper.java (70%) rename framework/src/main/java/cn/lili/modules/{message => sms}/mapper/SmsSignMapper.java (70%) rename framework/src/main/java/cn/lili/modules/{message => sms}/mapper/SmsTemplateMapper.java (69%) rename framework/src/main/java/cn/lili/modules/{message => sms}/service/SmsReachService.java (81%) rename framework/src/main/java/cn/lili/modules/{message => sms}/service/SmsSignService.java (91%) rename framework/src/main/java/cn/lili/modules/{message => sms}/service/SmsTemplateService.java (91%) rename framework/src/main/java/cn/lili/modules/{message => sms}/serviceimpl/SmsReachServiceImpl.java (84%) rename framework/src/main/java/cn/lili/modules/{message => sms}/serviceimpl/SmsSignServiceImpl.java (93%) rename framework/src/main/java/cn/lili/modules/{message => sms}/serviceimpl/SmsTemplateServiceImpl.java (93%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/entity/dos/WechatMPMessage.java (95%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/entity/dos/WechatMessage.java (95%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/entity/enums/WechatMessageItemEnums.java (96%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/mapper/WechatMPMessageMapper.java (78%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/mapper/WechatMessageMapper.java (77%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/service/WechatMPMessageService.java (73%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/service/WechatMessageService.java (72%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/serviceimpl/WechatMPMessageServiceImpl.java (95%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/serviceimpl/WechatMessageServiceImpl.java (94%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/util/WechatAccessTokenUtil.java (99%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/util/WechatMessageData.java (97%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/util/WechatMessageUtil.java (96%) rename framework/src/main/java/cn/lili/modules/{message => wechat}/util/WechatMpCodeUtil.java (99%) rename manager-api/src/main/java/cn/lili/controller/{member => wallet}/MemberWalletManagerController.java (97%) rename manager-api/src/main/java/cn/lili/controller/{member => wallet}/MemberWithdrawApplyManagerController.java (98%) rename manager-api/src/main/java/cn/lili/controller/{order => wallet}/RechargeManagerController.java (97%) rename manager-api/src/main/java/cn/lili/controller/{order => wallet}/WalletLogManagerController.java (97%) diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java index f7c63f4a..1ca3b1d8 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java @@ -5,10 +5,10 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.connect.entity.dto.WechatMPLoginParams; import cn.lili.modules.connect.service.ConnectService; -import cn.lili.modules.message.entity.dos.WechatMPMessage; +import cn.lili.modules.wechat.entity.dos.WechatMPMessage; import cn.lili.modules.message.service.ShortLinkService; -import cn.lili.modules.message.service.WechatMPMessageService; -import cn.lili.modules.message.util.WechatMpCodeUtil; +import cn.lili.modules.wechat.service.WechatMPMessageService; +import cn.lili.modules.wechat.util.WechatMpCodeUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberReceiptController.java similarity index 98% rename from buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java rename to buyer-api/src/main/java/cn/lili/controller/wallet/MemberReceiptController.java index 2d82d55c..63e2c6c4 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java +++ b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberReceiptController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.member; +package cn.lili.controller.wallet; import cn.lili.common.enums.ResultUtil; diff --git a/buyer-api/src/main/java/cn/lili/controller/order/WalletLogBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/wallet/WalletLogBuyerController.java similarity index 97% rename from buyer-api/src/main/java/cn/lili/controller/order/WalletLogBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/wallet/WalletLogBuyerController.java index 70ebd2c0..676301fe 100644 --- a/buyer-api/src/main/java/cn/lili/controller/order/WalletLogBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/wallet/WalletLogBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.order; +package cn.lili.controller.wallet; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.AuthUser; diff --git a/consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java index dbd1d6ea..97c84490 100644 --- a/consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/WechatMessageExecute.java @@ -2,7 +2,7 @@ package cn.lili.event.impl; import cn.lili.event.OrderStatusChangeEvent; import cn.lili.event.TradeEvent; -import cn.lili.modules.message.util.WechatMessageUtil; +import cn.lili.modules.wechat.util.WechatMessageUtil; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.order.entity.dto.OrderMessage; import cn.lili.modules.order.order.entity.vo.OrderVO; diff --git a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java index c45dad05..e0ce866e 100644 --- a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java @@ -10,7 +10,7 @@ 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.sms.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; diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java index 8e34ceca..b349250d 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java @@ -52,21 +52,4 @@ public class MemberStatisticsExecute implements EveryDayExecute { log.error("每日会员统计功能异常：", e); } } - - public static void main(String[] args) { - - //统计的时间（开始。结束时间） - Date startTime, endTime; - //初始值 - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MILLISECOND, 1); - calendar.set(Calendar.MINUTE, 0); - calendar.set(Calendar.HOUR_OF_DAY, 0); - endTime = calendar.getTime(); - //-1天，即为开始时间 - calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) - 1); - startTime = calendar.getTime(); - System.out.println(startTime); - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java b/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java index caaeb79f..59a05ca4 100644 --- a/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java +++ b/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java b/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java index e429aef4..f5f16fca 100644 --- a/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java +++ b/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java b/framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsReach.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java rename to framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsReach.java index a3b94bba..09ec8dfa 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java +++ b/framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsReach.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java b/framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsSign.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java rename to framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsSign.java index 2e54b1e5..6c7ade7d 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java +++ b/framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsSign.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java b/framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsTemplate.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java rename to framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsTemplate.java index ac6c3bdc..855721f0 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java +++ b/framework/src/main/java/cn/lili/modules/sms/entity/dos/SmsTemplate.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java b/framework/src/main/java/cn/lili/modules/sms/entity/dto/SmsReachDTO.java similarity index 67% rename from framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java rename to framework/src/main/java/cn/lili/modules/sms/entity/dto/SmsReachDTO.java index 14ac747f..8081387d 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java +++ b/framework/src/main/java/cn/lili/modules/sms/entity/dto/SmsReachDTO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java b/framework/src/main/java/cn/lili/modules/sms/mapper/SmsReachMapper.java similarity index 70% rename from framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java rename to framework/src/main/java/cn/lili/modules/sms/mapper/SmsReachMapper.java index 5856195e..dc59ac51 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java +++ b/framework/src/main/java/cn/lili/modules/sms/mapper/SmsReachMapper.java @@ -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; /** diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java b/framework/src/main/java/cn/lili/modules/sms/mapper/SmsSignMapper.java similarity index 70% rename from framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java rename to framework/src/main/java/cn/lili/modules/sms/mapper/SmsSignMapper.java index b600937f..fd566fb1 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java +++ b/framework/src/main/java/cn/lili/modules/sms/mapper/SmsSignMapper.java @@ -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; /** diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java b/framework/src/main/java/cn/lili/modules/sms/mapper/SmsTemplateMapper.java similarity index 69% rename from framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java rename to framework/src/main/java/cn/lili/modules/sms/mapper/SmsTemplateMapper.java index 78638896..ea92d487 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java +++ b/framework/src/main/java/cn/lili/modules/sms/mapper/SmsTemplateMapper.java @@ -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; /** diff --git a/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java b/framework/src/main/java/cn/lili/modules/sms/service/SmsReachService.java similarity index 81% rename from framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java rename to framework/src/main/java/cn/lili/modules/sms/service/SmsReachService.java index 3d9794f5..d93b6ef5 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java +++ b/framework/src/main/java/cn/lili/modules/sms/service/SmsReachService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java b/framework/src/main/java/cn/lili/modules/sms/service/SmsSignService.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java rename to framework/src/main/java/cn/lili/modules/sms/service/SmsSignService.java index 18439ae5..cada47a6 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java +++ b/framework/src/main/java/cn/lili/modules/sms/service/SmsSignService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java b/framework/src/main/java/cn/lili/modules/sms/service/SmsTemplateService.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java rename to framework/src/main/java/cn/lili/modules/sms/service/SmsTemplateService.java index 7fd1e946..b2ccf111 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java +++ b/framework/src/main/java/cn/lili/modules/sms/service/SmsTemplateService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java b/framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsReachServiceImpl.java similarity index 84% rename from framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java rename to framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsReachServiceImpl.java index 6863ba39..04fe52da 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsReachServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsSignServiceImpl.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java rename to framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsSignServiceImpl.java index 3cb086b8..85e48518 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsSignServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsTemplateServiceImpl.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java rename to framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsTemplateServiceImpl.java index 22fd9e4b..b9bbfe35 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/sms/serviceimpl/SmsTemplateServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java b/framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java index 1cbdf9b3..3d964d0a 100644 --- a/framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java +++ b/framework/src/main/java/cn/lili/modules/system/sms/AliSmsUtil.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java index 4fb1a507..5b48a1e4 100644 --- a/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/modules/system/sms/impl/SmsUtilAliImplService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java b/framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMPMessage.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java rename to framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMPMessage.java index 3150f70e..4e1d530c 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java +++ b/framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMPMessage.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java b/framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMessage.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java rename to framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMessage.java index adbff5eb..5753b2e6 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java +++ b/framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMessage.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/WechatMessageItemEnums.java b/framework/src/main/java/cn/lili/modules/wechat/entity/enums/WechatMessageItemEnums.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/message/entity/enums/WechatMessageItemEnums.java rename to framework/src/main/java/cn/lili/modules/wechat/entity/enums/WechatMessageItemEnums.java index beff0714..9d1697ec 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/WechatMessageItemEnums.java +++ b/framework/src/main/java/cn/lili/modules/wechat/entity/enums/WechatMessageItemEnums.java @@ -1,4 +1,4 @@ -package cn.lili.modules.message.entity.enums; +package cn.lili.modules.wechat.entity.enums; /** * 微信模版设置变量 diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/WechatMPMessageMapper.java b/framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMPMessageMapper.java similarity index 78% rename from framework/src/main/java/cn/lili/modules/message/mapper/WechatMPMessageMapper.java rename to framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMPMessageMapper.java index 954d7638..bd347022 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/WechatMPMessageMapper.java +++ b/framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMPMessageMapper.java @@ -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; /** diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/WechatMessageMapper.java b/framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMessageMapper.java similarity index 77% rename from framework/src/main/java/cn/lili/modules/message/mapper/WechatMessageMapper.java rename to framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMessageMapper.java index 1fbc16ab..1beb733a 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/WechatMessageMapper.java +++ b/framework/src/main/java/cn/lili/modules/wechat/mapper/WechatMessageMapper.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/service/WechatMPMessageService.java b/framework/src/main/java/cn/lili/modules/wechat/service/WechatMPMessageService.java similarity index 73% rename from framework/src/main/java/cn/lili/modules/message/service/WechatMPMessageService.java rename to framework/src/main/java/cn/lili/modules/wechat/service/WechatMPMessageService.java index 05b2aef8..962bed03 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/WechatMPMessageService.java +++ b/framework/src/main/java/cn/lili/modules/wechat/service/WechatMPMessageService.java @@ -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; /** * 微信小程序消息订阅 业务层 diff --git a/framework/src/main/java/cn/lili/modules/message/service/WechatMessageService.java b/framework/src/main/java/cn/lili/modules/wechat/service/WechatMessageService.java similarity index 72% rename from framework/src/main/java/cn/lili/modules/message/service/WechatMessageService.java rename to framework/src/main/java/cn/lili/modules/wechat/service/WechatMessageService.java index f471ed89..c5514586 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/WechatMessageService.java +++ b/framework/src/main/java/cn/lili/modules/wechat/service/WechatMessageService.java @@ -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; /** diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPMessageServiceImpl.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java rename to framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPMessageServiceImpl.java index ea351055..87fba396 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPMessageServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java similarity index 94% rename from framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java rename to framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java index f64ce75a..6b00979b 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java b/framework/src/main/java/cn/lili/modules/wechat/util/WechatAccessTokenUtil.java similarity index 99% rename from framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java rename to framework/src/main/java/cn/lili/modules/wechat/util/WechatAccessTokenUtil.java index fc7411c8..6c0e5c29 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java +++ b/framework/src/main/java/cn/lili/modules/wechat/util/WechatAccessTokenUtil.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageData.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java rename to framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageData.java index 8866cb31..e425ab8c 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java +++ b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageData.java @@ -1,4 +1,4 @@ -package cn.lili.modules.message.util; +package cn.lili.modules.wechat.util; import cn.hutool.json.JSONUtil; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java rename to framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java index 43cfba6f..d3ad5fca 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java +++ b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMessageUtil.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMpCodeUtil.java similarity index 99% rename from framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java rename to framework/src/main/java/cn/lili/modules/wechat/util/WechatMpCodeUtil.java index ba93afa6..519a6e8e 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java +++ b/framework/src/main/java/cn/lili/modules/wechat/util/WechatMpCodeUtil.java @@ -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; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java index e466affd..7ce9b545 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java @@ -3,8 +3,8 @@ package cn.lili.controller.setting; 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.SmsReach; -import cn.lili.modules.message.service.SmsReachService; +import cn.lili.modules.sms.entity.dos.SmsReach; +import cn.lili.modules.sms.service.SmsReachService; import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java index 9ed17cee..b7bdb8d0 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java @@ -3,8 +3,8 @@ package cn.lili.controller.setting; 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.SmsSign; -import cn.lili.modules.message.service.SmsSignService; +import cn.lili.modules.sms.entity.dos.SmsSign; +import cn.lili.modules.sms.service.SmsSignService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java index bd8ae97b..3ff6a416 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java @@ -3,8 +3,8 @@ package cn.lili.controller.setting; 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.SmsTemplate; -import cn.lili.modules.message.service.SmsTemplateService; +import cn.lili.modules.sms.entity.dos.SmsTemplate; +import cn.lili.modules.sms.service.SmsTemplateService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java index 366363ac..cdfc2ba8 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java @@ -5,8 +5,8 @@ import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; -import cn.lili.modules.message.entity.dos.WechatMPMessage; -import cn.lili.modules.message.service.WechatMPMessageService; +import cn.lili.modules.wechat.entity.dos.WechatMPMessage; +import cn.lili.modules.wechat.service.WechatMPMessageService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java index f2f3634c..e36872e2 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java @@ -4,8 +4,8 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.message.entity.dos.WechatMessage; -import cn.lili.modules.message.service.WechatMessageService; +import cn.lili.modules.wechat.entity.dos.WechatMessage; +import cn.lili.modules.wechat.service.WechatMessageService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java b/manager-api/src/main/java/cn/lili/controller/wallet/MemberWalletManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java rename to manager-api/src/main/java/cn/lili/controller/wallet/MemberWalletManagerController.java index 8fc89b45..927c8816 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/wallet/MemberWalletManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.member; +package cn.lili.controller.wallet; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java b/manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java similarity index 98% rename from manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java rename to manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java index 7b372446..b4d5ab42 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.member; +package cn.lili.controller.wallet; import cn.lili.common.enums.ResultUtil; diff --git a/manager-api/src/main/java/cn/lili/controller/order/RechargeManagerController.java b/manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/order/RechargeManagerController.java rename to manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java index 282468b4..ce284937 100644 --- a/manager-api/src/main/java/cn/lili/controller/order/RechargeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.order; +package cn.lili.controller.wallet; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; diff --git a/manager-api/src/main/java/cn/lili/controller/order/WalletLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java similarity index 97% rename from manager-api/src/main/java/cn/lili/controller/order/WalletLogManagerController.java rename to manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java index dcac39a5..0fa6776c 100644 --- a/manager-api/src/main/java/cn/lili/controller/order/WalletLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.order; +package cn.lili.controller.wallet; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO;